From 7bb3f74831add202a5b764cc0d01890960452c5e Mon Sep 17 00:00:00 2001 From: Michael Erdely Date: Sat, 19 Oct 2024 00:21:50 -0400 Subject: [PATCH] fix .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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