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