Auto stash before merge of "main" and "origin/main"

nicht mehr kaputt
This commit is contained in:
Albion
2022-12-10 09:37:01 +01:00
parent 23f14286fd
commit 9f6f423179
135 changed files with 7 additions and 1100 deletions

View File

@@ -69,7 +69,10 @@ _global_script_class_icons={
[application]
config/name="Semester Game Jam 2022"
<<<<<<< HEAD
run/main_scene="res://menu/main_menu.tscn"
=======
>>>>>>> parent of 742e4e2... Auto stash before merge of "main" and "origin/main"
config/features=PackedStringArray("4.0", "Forward Plus")
config/icon="res://icon.svg"