From 9adfd6311fb7e5b6a72d8a4c227fc723cfeccd93 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 27 Nov 2015 17:09:01 +0100
Subject: [PATCH] fix merge conflict

---
 website/src/models/user.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/website/src/models/user.js b/website/src/models/user.js
index 45fb751506..be2274adbd 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -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},