aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--node_simple.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/node_simple.js b/node_simple.js
index b2321f2..5c0666b 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -130,7 +130,6 @@ exports.add_user = function (fields, callbackUser) {
var users = db.collection('users');
var logins = db.collection('logins');
-<<<<<<< HEAD
// Add users, and login through callbacks
users.insertOne( user_data, function (err) {
if (err) {