From 56346ad88c26a0b2f8bfa3b7f9cf3f0d89f4bc9e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 1 Jul 2015 15:44:46 +0100 Subject: [PATCH] remove analytics router and fixed bad package.json --- services/web/app/coffee/router.coffee | 1 - services/web/package.json | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index d9ff55a0a3..98c15fcf43 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -64,7 +64,6 @@ module.exports = class Router PasswordResetRouter.apply(webRouter, apiRouter) StaticPagesRouter.apply(webRouter, apiRouter) RealTimeProxyRouter.apply(webRouter, apiRouter) - AnalyticsRouter.apply(webRouter, apiRouter) Modules.applyRouter(webRouter, apiRouter) diff --git a/services/web/package.json b/services/web/package.json index 5cb505a93e..fe8aab83a9 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -12,11 +12,8 @@ "dependencies": { "archiver": "0.9.0", "async": "0.6.2", -<<<<<<< HEAD -======= "base64-stream": "^0.1.2", "basic-auth-connect": "^1.0.0", ->>>>>>> 90b15d3... v1 of express4 conversion "bcrypt": "0.8.3", "body-parser": "^1.13.1", "bufferedstream": "1.6.0", @@ -31,22 +28,14 @@ "ldapjs": "^0.7.1", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0", "lynx": "0.1.1", -<<<<<<< HEAD -======= "marked": "^0.3.3", "method-override": "^2.3.3", ->>>>>>> 90b15d3... v1 of express4 conversion "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.1.0", "mimelib": "0.2.14", "mocha": "1.17.1", "mongojs": "0.18.2", "mongoose": "3.8.28", -<<<<<<< HEAD -======= - "mongoose-auto-increment": "3.0.2", "multer": "^0.1.8", - "mysql": "^2.7.0", ->>>>>>> 90b15d3... v1 of express4 conversion "node-uuid": "1.4.1", "nodemailer": "0.6.1", "optimist": "0.6.1",