|
|
|
@ -1,8 +1,6 @@
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
# Godot 4+ specific ignores
|
|
|
|
# Godot 4+ specific ignores
|
|
|
|
.godot/
|
|
|
|
.godot/
|
|
|
|
/android/
|
|
|
|
/android/
|
|
|
|
=======
|
|
|
|
|
|
|
|
# ---> Godot
|
|
|
|
# ---> Godot
|
|
|
|
# Godot 4+ specific ignores
|
|
|
|
# Godot 4+ specific ignores
|
|
|
|
.godot/
|
|
|
|
.godot/
|
|
|
|
@ -20,4 +18,3 @@ export_presets.cfg
|
|
|
|
data_*/
|
|
|
|
data_*/
|
|
|
|
mono_crash.*.json
|
|
|
|
mono_crash.*.json
|
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> 888d736ce7ea2debeed0ad9b786ae60a4fb59638
|
|
|
|
|
|
|
|
|