fix(i18n)

package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0-152",
   "main": "./src/server.js",
   "dependencies": {
-    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#develop",
+    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#paglias/translate",
     "connect-mongo": "*",
     "express": "3.5.x",
     "gzippo": "*",

src/routes/apiv2.coffee

@@ -300,26 +300,6 @@ module.exports = (swagger, v2) ->
         ]
       action: user.unlock
 
-<<<<<<< HEAD
-=======
-    "/user/buy-gems":
-      spec: method: 'POST', description: "Do not use this route"
-      middleware: [auth.auth, i18n.getUserLanguage]
-      action:user.buyGems
-
-    "/user/cancel-subscription":
-      spec: method: 'POST', description: "Do not use this route"
-      middleware: [auth.auth, i18n.getUserLanguage]
-      action:user.cancelSubscription
-
-    "/user/buy-gems/paypal-ipn":
-      spec:
-        method: 'POST'
-        description: "Don't use this route"
-      middleware: []
-      action: user.buyGemsPaypalIPN
-
->>>>>>> refactor(i18n): refactor user language detection, add to api methods
     "/user/batch-update":
       spec:
         method: 'POST'

src/routes/pages.js

@@ -3,12 +3,9 @@ var express = require('express');
 var router = new express.Router();
 var _ = require('lodash');
 var middleware = require('../middleware');
-<<<<<<< HEAD
 var user = require('../controllers/user');
 var auth = require('../controllers/auth');
-=======
 var i18n = require('../i18n');
->>>>>>> refactor(i18n): refactor user language detection, add to api methods
 
 // -------- App --------
 router.get('/', i18n.getUserLanguage, middleware.locals, function(req, res) {