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