protect config.h

This commit is contained in:
seanpringle
2012-10-25 02:05:48 +10:00
parent 1508e1a748
commit 5d6b0fc687

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
config.h merge=ours