fix .gitattributes

This commit is contained in:
Michael Erdely 2024-10-19 00:21:50 -04:00
parent 073e491115
commit 7bb3f74831

2
.gitattributes vendored
View file

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