protect config.h

This commit is contained in:
seanpringle
2012-10-25 02:05:09 +10:00
parent 9c159e3cc5
commit 95983b1789

1
.gitattributes vendored Normal file
View File

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