Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-27 17:09:01 +01:00
parent 5fa514b6fa
commit 9adfd6311f
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/models/user.js
+1 -10
View File
@@ -164,22 +164,13 @@ export let schema = new Schema({
inviteParty: {type: Boolean, default: false},
},
ios: {
<<<<<<< HEAD
addTask: {type: Boolean, default: false},
editTask: {type: Boolean, default: false},
deleteTask: {type: Boolean, default: false},
filterTask: {type: Boolean, default: false},
groupPets: {type: Boolean, default: false},
inviteParty: {type: Boolean, default: false},
},
=======
addTask: {type: Boolean, 'default': false},
editTask: {type: Boolean, 'default': false},
deleteTask: {type: Boolean, 'default': false},
filterTask: {type: Boolean, 'default': false},
groupPets: {type: Boolean, 'default': false},
inviteParty: {type: Boolean, 'default': false},
}
>>>>>>> develop
},
dropsEnabled: {type: Boolean, default: false},
itemsEnabled: {type: Boolean, default: false},