fix: merge conflict

0e80ae20 · donghyun · 0bea7fc6 · 0e80ae20
Commit 0e80ae20 authored 1 year ago by donghyun
--- a/app.js
+++ b/app.js
@@ -58,8 +58,5 @@ async function main() {
  server.listen(socketPort, () => {
    console.log("running on port " + socketPort);
  });
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> d4db7fb6f22a8afc093c1a32a495324d90af24a6
+