protect config.h
This commit is contained in:
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
config.h merge=ours
|
||||||
Reference in New Issue
Block a user