Update '.gitattributes'
This commit is contained in:
parent
0bd3d5d723
commit
a0c7302d29
3
.gitattributes
vendored
3
.gitattributes
vendored
@ -1,9 +1,6 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
*.uasset filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> 2bf64669a35578a26fb57794375793e931527e0b
|
||||
Content/** filter=lfs diff=lfs merge=lfs -text
|
Loading…
Reference in New Issue
Block a user