Add buildinfo and other folders, update gitignore
This commit is contained in:
+1
-5
@@ -1,14 +1,10 @@
|
||||
|
||||
############################################################
|
||||
# DO NOT EDIT THIS FILE - the content may be overwritten
|
||||
# Version: 1.0.0.0
|
||||
############################################################
|
||||
|
||||
|
||||
|
||||
# not try to merge files when they have conflicts, but rather use our side of the merge over others.
|
||||
* merge=ours
|
||||
|
||||
# tread these files as binaries
|
||||
*.meta -text -diff
|
||||
*.object -text -diff
|
||||
buildinfo/* filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
Reference in New Issue
Block a user