fix gitattributes
This commit is contained in:
parent
65e3c7b02f
commit
c8e0ae420e
1 changed files with 1 additions and 1 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -1 +1 @@
|
|||
includes/config.php merge=ours
|
||||
src/includes/config.php merge=ours
|
||||
|
|
Loading…
Add table
Reference in a new issue