merge config

ucsd-cse125-sp24 · Jun 6, 2024 · 6dee9fc · 6dee9fc
1 parent 039c139
commit 6dee9fc
Showing 1 changed file with 2 additions and 23 deletions.
diff --git a/config.json b/config.json
@@ -5,7 +5,6 @@
       "procedural": false,
       "maze_file": "test/itemRoom.maze"
     },
-<<<<<<< HEAD
     "disable_enemies": true
   },
   "network": {
@@ -24,27 +23,7 @@
     "lobby_discovery": true,
     "fullscreen": false,
     "draw_bboxes": false,
-    "fps_counter": true
+    "fps_counter": true,
+    "presentation": false
   }
-=======
-    "network": {
-        "server_ip": "localhost",
-        "server_port": 2355
-    },
-    "server": {
-        "lobby_name": "Hope you're doing well!1",
-        "lobby_broadcast": true,
-        "max_players": 1,
-        "disable_dm": true,
-        "skip_intro": false 
-    },
-    "client": {
-        "default_name": "Conan O'Brien",
-        "lobby_discovery": true,
-        "fullscreen": true,
-        "draw_bboxes": false,
-        "fps_counter": true,
-        "presentation": false 
-    }
->>>>>>> origin/dev
 }