Skip to content
Snippets Groups Projects
Commit 0e80ae20 authored by donghyun's avatar donghyun
Browse files

fix: merge conflict

parent 0bea7fc6
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 4 deletions
app.js
+ 1
− 4
View file @ 0e80ae20
...@@ -58,8 +58,5 @@ async function main() { ...@@ -58,8 +58,5 @@ async function main() {
server.listen(socketPort, () => { server.listen(socketPort, () => {
console.log("running on port " + socketPort); console.log("running on port " + socketPort);
}); });
<<<<<<< HEAD
} }
=======
}
>>>>>>> d4db7fb6f22a8afc093c1a32a495324d90af24a6
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr