diff --git a/.gitattributes b/.gitattributes index 9a0c70e..8c9c7e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -includes/config.php merge=ours +src/includes/config.php merge=ours