codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-14 07:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved small merge issue

Browse source
This commit is contained in:
Barry 2015-12-10 19:27:54 -05:00
parent 3db216a341
commit e6787c0fd2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.coffee
View file

@ -48,10 +48,9 @@ exports.config =
usePolling: true
server:
<<<<<<< HEAD
=======
# NOTE: This is a temporary workaround for https://github.com/nodejs/node-v0.x-archive/issues/2318
>>>>>>> 4458a577715fd672254203208d099cd539afc9fb
command: "#{if process.platform is 'win32' then 'node_modules\\.bin\\nodemon.cmd' else 'nodemon'} ."
files: