fix gitattributes

This commit is contained in:
Michael Erdely 2024-10-19 00:21:19 -04:00
parent 65e3c7b02f
commit c8e0ae420e

2
.gitattributes vendored
View file

@ -1 +1 @@
includes/config.php merge=ours
src/includes/config.php merge=ours