aboutsummaryrefslogtreecommitdiff
path: root/node_simple.js
diff options
context:
space:
mode:
authornanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-07-22 05:29:28 +0000
committernanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-07-22 05:29:28 +0000
commite0da9feb10efd002f6ebaa99870b4317687a4557 (patch)
tree2a695e0588006041f4b7182b6f38f5de7c405c71 /node_simple.js
parente12c4639ce6ad2bd1333ee0f0ae07f12c1db2e73 (diff)
minor fix
Diffstat (limited to 'node_simple.js')
-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) {