mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
.gitattributes Update
Don't consider them binaries anymore, since we're using mapmerge.
This commit is contained in:
3
.gitattributes
vendored
3
.gitattributes
vendored
@@ -2,9 +2,6 @@
|
|||||||
# needs additional setup, see tools/mapmerge/install.txt
|
# needs additional setup, see tools/mapmerge/install.txt
|
||||||
# *.dmm merge=merge-dmm
|
# *.dmm merge=merge-dmm
|
||||||
|
|
||||||
# Nope, now they're binaries.
|
|
||||||
*.dmm binary
|
|
||||||
|
|
||||||
# dmi icon merger hook
|
# dmi icon merger hook
|
||||||
# needs additional setup, see tools/dmitool/merging.txt
|
# needs additional setup, see tools/dmitool/merging.txt
|
||||||
*.dmi merge=merge-dmi
|
*.dmi merge=merge-dmi
|
||||||
|
|||||||
Reference in New Issue
Block a user