Clean up configuration files

LorenzCK · LorenzCK · commit 764ba01ee1e2 · 2019-08-07T12:29:43.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,6 @@
 # Do not process any file :)
 * -text
+
+docker-compose.custom.yml merge=ours
+config.env merge=ours
+secret.env merge=ours
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 \.vs/
 *.csproj.user
 secret.env
+config.env
 composer.phar
 /src/DonationManager/vendor/*
 *.xlsx
diff --git a/config-template.env b/config-template.env
