Compare commits
3 Commits
25f8c12d40
...
df1ca6b74b
| Author | SHA1 | Date | |
|---|---|---|---|
| df1ca6b74b | |||
| 29ad00d44f | |||
| ca71de0ad0 |
@@ -1,3 +1,4 @@
|
||||
# Zorg dat omgevingsspecifieke bestanden nooit worden overschreven bij merges tussen dev en main
|
||||
config/config.php merge=ours
|
||||
includes/env_badge.php merge=ours
|
||||
|
||||
|
||||
+2
-1
@@ -6,9 +6,10 @@
|
||||
|
||||
$envVars = [];
|
||||
|
||||
// 1. Zoek naar .env of val terug op .env.example
|
||||
// 1. Zoek naar .env of val terug op config/.env.example
|
||||
$envCandidates = [
|
||||
__DIR__ . '/../.env',
|
||||
__DIR__ . '/.env.example',
|
||||
__DIR__ . '/../.env.example',
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user