merged new graph format

Brianna Sookhoo · Brianna Sookhoo · commit 3f67898da4de · 2020-05-13T00:24:02.000-07:00
diff --git a/user/settings.json b/user/settings.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"setupRequired":false,"services":[["asdf","MongoDB","mongodb+srv://alon:testing123@cluster0-phsei.mongodb.net/test?retryWrites=true&w=majority"]],"splash":true}
-=======
 {"setupRequired":false,"services":[["Test","MongoDB","mongodb+srv://alon:testing123@cluster0-phsei.mongodb.net/test?retryWrites=true&w=majority"]],"splash":false}
->>>>>>> f44452fa8acda19c6131565d833c41404df7bd4d
