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
|
||||
# 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
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -29,3 +29,7 @@ project/**/*.theirs
|
||||
|
||||
# Ignore .apsession
|
||||
.apsession
|
||||
|
||||
!buildinfo/
|
||||
|
||||
!other/
|
||||
|
||||
BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
(Stored with Git LFS)
Normal file
BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids
(Stored with Git LFS)
Normal file
BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
(Stored with Git LFS)
Normal file
BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
(Stored with Git LFS)
Normal file
Binary file not shown.
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