Squash conflict
This commit is contained in:
1 parent
353a9436ee
commit
248e2ce6d9
1 file changed
-11
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user