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

Merge branch 'dev' of https://git.webenpcstudio.nl/NiekRabelink/Fociz into dev

Browse Source
This commit is contained in:
Niek Rabelink
2026-09-09 16:46:41 +02:00
parent c5629dcfaa 4a566182ba
commit 1487b680f1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1 -3
View File
@@ -1,5 +1,3 @@
# 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