From 333e9c245197189ce4d4438d21d399868dfd519b Mon Sep 17 00:00:00 2001 From: NiekRabelink Date: Wed, 9 Sep 2026 14:39:27 +0000 Subject: [PATCH] Update .gitattributes --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8579a1d..48107a8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ # Zorg dat omgevingsspecifieke bestanden nooit worden overschreven bij merges tussen dev en main -config/config.php merge=ours +#//config/config.php merge=ours includes/env_badge.php merge=ours -config/.env.example merge=ours +#//config/.env.example merge=ours