From 99a361c0bed03ca49335c70cd628414d9b0faedb Mon Sep 17 00:00:00 2001
From: 0xRenegade <therenegadecoding@gmail.com>
Date: Sat, 24 Sep 2022 11:42:17 -0500
Subject: [PATCH 1/3] move env to example, so we don't run into merge conflicts
 constantly

---
 qrcode/.gitignore                                          | 1 +
 qrcode/config/{environment.php => environment.php.example} | 0
 2 files changed, 1 insertion(+)
 create mode 100644 qrcode/.gitignore
 rename qrcode/config/{environment.php => environment.php.example} (100%)

diff --git a/qrcode/.gitignore b/qrcode/.gitignore
new file mode 100644
index 0000000..c295030
--- /dev/null
+++ b/qrcode/.gitignore
@@ -0,0 +1 @@
+config/environment.php
\ No newline at end of file
diff --git a/qrcode/config/environment.php b/qrcode/config/environment.php.example
similarity index 100%
rename from qrcode/config/environment.php
rename to qrcode/config/environment.php.example

From d99e8132c990cfaaf8368be6a2eee3a717eea684 Mon Sep 17 00:00:00 2001
From: 0xRenegade <therenegadecoding@gmail.com>
Date: Sat, 24 Sep 2022 11:44:02 -0500
Subject: [PATCH 2/3] update main gitignore to add in environment.php

---
 .gitignore        | 3 ++-
 qrcode/.gitignore | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 qrcode/.gitignore

diff --git a/.gitignore b/.gitignore
index e00e331..37bdb0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .settings
 .project
 .idea
-.DS_Store
\ No newline at end of file
+.DS_Store
+qrcode/config/environment.php
\ No newline at end of file
diff --git a/qrcode/.gitignore b/qrcode/.gitignore
deleted file mode 100644
index c295030..0000000
--- a/qrcode/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config/environment.php
\ No newline at end of file

From cbc524616354daef28d76dab88551feeef5f63b9 Mon Sep 17 00:00:00 2001
From: 0xRenegade <therenegadecoding@gmail.com>
Date: Sat, 24 Sep 2022 11:52:34 -0500
Subject: [PATCH 3/3] update docs for this change

---
 documentation/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/index.html b/documentation/index.html
index b8eb1d2..3c37a4b 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -87,6 +87,7 @@
             <p>Follow these steps to install the script:</p>
             <ol><strong>
                 <li>Clone the project from github</li>
+                <li>Copy /config/environment.php.example over to /config/environment.php</li>
                 <li>Edit the yaml file for docker or manually enter the credentials you want in the /config/environment.php file</li>
                 <li>Launch the setup file in your browser /install/setup.php</li>
                 <p>The script checks the requirements, write permissions on the generated folders and creates a database with sample data</p>