resolve merge conflict

3 files changed, 0 insertions, 4 deletions

diff --git a/src/node/db/AuthorManager.js b/src/node/db/AuthorManager.js
index 5ba608e9..e0f569ef 100644
--- a/src/node/db/AuthorManager.js
+++ b/src/node/db/AuthorManager.js
@@ -21,7 +21,6 @@
 
 var ERR = require("async-stacktrace");
 var db = require("./DB").db;
-var async = require("async");
 var customError = require("../utils/customError");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
 
diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js
index df3c3826..6fae57ff 100644
--- a/src/node/db/SecurityManager.js
+++ b/src/node/db/SecurityManager.js
@@ -20,7 +20,6 @@
 
 
 var ERR = require("async-stacktrace");
-var db = require("./DB").db;
 var async = require("async");
 var authorManager = require("./AuthorManager");
 var padManager = require("./PadManager");
diff --git a/src/node/db/SessionStore.js b/src/node/db/SessionStore.js
index 52a504f1..5c45ddb3 100644
--- a/src/node/db/SessionStore.js
+++ b/src/node/db/SessionStore.js
@@ -5,8 +5,6 @@
  */
 
 var Store = require('ep_etherpad-lite/node_modules/connect/lib/middleware/session/store'),
-  utils = require('ep_etherpad-lite/node_modules/connect/lib/utils'),
-  Session = require('ep_etherpad-lite/node_modules/connect/lib/middleware/session/session'),
   db = require('ep_etherpad-lite/node/db/DB').db,
   log4js = require('ep_etherpad-lite/node_modules/log4js'),
   messageLogger = log4js.getLogger("SessionStore");