Squash conflict

This commit is contained in:
Barry Low committed 2018-09-07 08:23:44 -07:00
1 parent 353a9436ee
commit 248e2ce6d9
1 file changed
-11
-11
View File
@@ -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);