Added .gitattributes to help with merge conflicts
This commit is contained in:
parent
e7f50f7108
commit
4e0d725877
1 changed files with 6 additions and 0 deletions
6
.gitattributes
vendored
Normal file
6
.gitattributes
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
*.unity merge=unityyamlmerge eol=lf
|
||||
*.prefab merge=unityyamlmerge eol=lf
|
||||
*.asset merge=unityyamlmerge eol=lf
|
||||
*.mat merge=unityyamlmerge eol=lf
|
||||
*.meta merge=unityyamlmerge eol=lf
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue