sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge errors

Browse source
This commit is contained in:
Daniel Saewitz 2013-02-19 21:00:29 -05:00
parent 2e11c0e82b
commit 40036109ef
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/index.coffee
View file

@ -9,12 +9,8 @@ app = require '../app'
serverError = require './serverError'
MongoStore = require('connect-mongo')(express)
priv = require './private'
<<<<<<< HEAD
habitrpgStore = require './store'
middleware = require './middleware'
=======
habitrpgStore = require('./store')
>>>>>>> b1f7c3cdfa9363b26b59f6e651ccf0d680313773
## RACER CONFIGURATION ##