@@ -125,10 +125,7 @@
"Checklists": true,
"Settings": true,
"InvitationCodes": true,
-<<<<<<< HEAD
"Winston":true
-=======
"JsonRoutes" : true
->>>>>>> 3a5150f6eef86816471f7b0134d3d93cf6686413
}