Files
Yogstation/.gitattributes
Francis Devine 1cc7f13e5f Merge remote-tracking branch 'upstream/master' into ihateuall
Conflicts:
	.gitattributes
2015-12-17 15:41:08 +13:00

13 lines
277 B
Plaintext

# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm
# dmi icon merger hook
# needs additional setup, see tools/dmitool/merging.txt
*.dmi merge=merge-dmi
# force changelog merging to use union
html/changelog.html merge=union