Update .gitattributes
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user