From 248e2ce6d944a69c31b696f1c37c2418dc3622fd Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 7 Sep 2018 08:23:44 -0700 Subject: [PATCH] Squash conflict --- server/models/user.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/server/models/user.js b/server/models/user.js index 3dadf7a26..ea2693fa8 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -2,7 +2,6 @@ const mongoose = require('mongoose'); const Schema = mongoose.Schema; const userSchema = new Schema({ -<<<<<<< HEAD authId: String, alias: String, firstName:String, @@ -14,16 +13,6 @@ isDeveloper: Boolean, isTrader: Boolean, isDataAnalyst: Boolean, roleId: String -======= - authId: String, - alias: String, - firstName:String, - lastName: String, - isDeveloper: Boolean, - isTrader: Boolean, - isDataAnalyst: Boolean, - roleId: String ->>>>>>> feature/integrate-Auth0 }) global.UserSchema = global.UserSchema || mongoose.model('User', userSchema);