cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13720 from optimumtact/ihateuall

Browse Source 
attributes revert
This commit is contained in:
Cheridan
2015-12-16 20:43:06 -06:00
parent d6f7ad26ee 1cc7f13e5f
commit 9a62f344ec
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@@ -1,12 +1,10 @@
code/* text=auto
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm binary
*.dmm merge=merge-dmm
# dmi icon merger hook
# needs additional setup, see tools/dmitool/merging.txt
*.dmi merge=merge-dmi binary
*.dmi merge=merge-dmi
# force changelog merging to use union
html/changelog.html merge=union