更改gitnore
This commit is contained in:
parent
f59ed5b8dd
commit
b6e4fbf442
|
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
|
|
@ -22,24 +21,4 @@ dist-ssr
|
|||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
=======
|
||||
# Build and Release Folders
|
||||
bin-debug/
|
||||
bin-release/
|
||||
[Oo]bj/
|
||||
[Bb]in/
|
||||
|
||||
# Other files and folders
|
||||
.settings/
|
||||
|
||||
# Executables
|
||||
*.swf
|
||||
*.air
|
||||
*.ipa
|
||||
*.apk
|
||||
|
||||
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
|
||||
# should NOT be excluded as they contain compiler settings and other important
|
||||
# information for Eclipse / Flash Builder.
|
||||
>>>>>>> 5369ea967bc3c822fd8b6ab5287e759a8421a757
|
||||
*.sw?
|
||||
Loading…
Reference in New Issue