NiekRabelink/Fociz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update .gitattributes

Browse Source
This commit is contained in:
NiekRabelink
2026-09-09 14:39:27 +00:00
parent ce7b2762df
commit 333e9c2451
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2 -2
View File
@@ -1,5 +1,5 @@
# Zorg dat omgevingsspecifieke bestanden nooit worden overschreven bij merges tussen dev en main # 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 includes/env_badge.php merge=ours
config/.env.example merge=ours #//config/.env.example merge=ours