mg-master

@@ -27,11 +27,7 @@
             "request": "launch",
             "name": "Node",
             "program": "${workspaceFolder}/app.js",
-<<<<<<< HEAD
             "console": "integratedTerminal"
-=======
-            "console":"integratedTerminal"
->>>>>>> origin/master
         }
     ]
 }