Merge branch 'master' of https://git.woitschetzki.de/Gremlinsoft/PrincessDragonSlayer
commit
408c015c94
@ -1,3 +1,23 @@
|
||||
<<<<<<< HEAD
|
||||
# Godot 4+ specific ignores
|
||||
.godot/
|
||||
android/
|
||||
=======
|
||||
# ---> Godot
|
||||
# Godot 4+ specific ignores
|
||||
.godot/
|
||||
|
||||
# Godot-specific ignores
|
||||
.import/
|
||||
export.cfg
|
||||
export_presets.cfg
|
||||
|
||||
# Imported translations (automatically generated from CSV files)
|
||||
*.translation
|
||||
|
||||
# Mono-specific ignores
|
||||
.mono/
|
||||
data_*/
|
||||
mono_crash.*.json
|
||||
|
||||
>>>>>>> e5c889106df912758b47dc23ee0a39485278ae3a
|
||||
|
||||
Loading…
Reference in New Issue