add gitattributres
This commit is contained in:
parent
55e52eef36
commit
dc56c18989
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
includes/config.php merge=ours
|
Loading…
Add table
Reference in a new issue