Add buildinfo and other folders, update gitignore
This commit is contained in:
parent
ddfdb5b73a
commit
3c6763278d
6
.gitattributes
vendored
6
.gitattributes
vendored
@ -1,14 +1,10 @@
|
|||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
# DO NOT EDIT THIS FILE - the content may be overwritten
|
# DO NOT EDIT THIS FILE - the content may be overwritten
|
||||||
# Version: 1.0.0.0
|
# Version: 1.0.0.0
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# not try to merge files when they have conflicts, but rather use our side of the merge over others.
|
# not try to merge files when they have conflicts, but rather use our side of the merge over others.
|
||||||
* merge=ours
|
* merge=ours
|
||||||
|
|
||||||
# tread these files as binaries
|
# tread these files as binaries
|
||||||
*.meta -text -diff
|
*.meta -text -diff
|
||||||
*.object -text -diff
|
*.object -text -diff
|
||||||
|
buildinfo/* filter=lfs diff=lfs merge=lfs -text
|
||||||
|
|||||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -29,3 +29,7 @@ project/**/*.theirs
|
|||||||
|
|
||||||
# Ignore .apsession
|
# Ignore .apsession
|
||||||
.apsession
|
.apsession
|
||||||
|
|
||||||
|
!buildinfo/
|
||||||
|
|
||||||
|
!other/
|
||||||
|
|||||||
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:61ab0f2fffacebdab40f719add3565ea7f13006095ec367ee2dfa9bd103a9607
|
||||||
|
size 60844864
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a9a9e39703e447ee56ba634166eee111f0c10c5e109b07e783d1c4b5803f6a13
|
||||||
|
size 32
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:61ab0f2fffacebdab40f719add3565ea7f13006095ec367ee2dfa9bd103a9607
|
||||||
|
size 60844864
|
||||||
0
other/New Text Document.txt
Normal file
0
other/New Text Document.txt
Normal file
Loading…
x
Reference in New Issue
Block a user