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