Compare commits

..

No commits in common. "main" and "master" have entirely different histories.
main ... master

View File

@ -11,10 +11,7 @@ config_version=5
[application]
config/name="lakewood"
<<<<<<< HEAD
=======
run/main_scene="res://world.tscn"
>>>>>>> f25b89aa52bc76423cd04483e3b0644fe3df1dc6
config/features=PackedStringArray("4.3", "Forward Plus")
config/icon="res://icon.svg"