From 0b1a8325846ba4f86193e8a45a1ddaf841b159ea Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Wed, 12 Jun 2024 14:32:38 +0200
Subject: [PATCH] Move .env file to .env.dist to avoid update conflicts. (#419)

* Move .env file to .env.dist to avoid update conflicts.

* Add customizable files to .gitignore.
---
 .env => .env.dist | 0
 .gitignore        | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename .env => .env.dist (100%)

diff --git a/.env b/.env.dist
similarity index 100%
rename from .env
rename to .env.dist
diff --git a/.gitignore b/.gitignore
index 332333c9..1f0b4ba6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-docker-compose-test.yml
+docker-compose.override.yml
+.env
\ No newline at end of file