Resolve Conflicts #10

Merged
Snoweuph merged 8 commits from dev-scene into dev-base 2023-01-31 11:43:28 +00:00
Showing only changes of commit cca7a3c6ea - Show all commits

15
.gitattributes vendored
View file

@ -1,2 +1,13 @@
# Normalize EOL for all files that Git considers text files. # ---> Godot
* text=auto eol=lf # Godot-specific ignores
.import/
export.cfg
export_presets.cfg
# Imported translations (automatically generated from CSV files)
*.translation
# Mono-specific ignores
.mono/
data_*/