Resolve Conflicts #10
1 changed files with 13 additions and 2 deletions
15
.gitattributes
vendored
15
.gitattributes
vendored
|
@ -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_*/
|
||||||
|
|
||||||
|
|
Reference in a new issue