2026-08-21 01:00:24 +00:00
1 changed files with 0 additions and 11 deletions
@@ -8,20 +8,12 @@ config_version=5

 config/name="AGP-Game"
 run/main_scene="res://scenes/main_menu.tscn"
-<<<<<<< HEAD
-config/features=PackedStringArray("4.6.2.stable")
-=======
 config/features=PackedStringArray("4.6.2")
->>>>>>> origin/main
 agp/api_base_url="http://127.0.0.1:8000"

 [autoload]

 ApiClient="*res://scripts/api_client.gd"
-<<<<<<< HEAD
-Server="*res://scripts/server.gd"
-=======
->>>>>>> origin/main

 [display]

@@ -29,7 +21,6 @@ window/size/viewport_width=1920
 window/size/viewport_height=1080
 window/stretch/mode="canvas_items"

-<<<<<<< HEAD
 [input]

 move_forward={
@@ -53,8 +44,6 @@ move_down={
 ]
 }

-=======
->>>>>>> origin/main
 [rendering]

 renderer/rendering_method="gl_compatibility"