From 5eb953f2a0dcec13f4ab335c75e8a83bd6ddda1e Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 8 Jan 2022 19:07:50 -0500
Subject: [PATCH] Fix footer

---
 app/frontend/templates/footer.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/frontend/templates/footer.html b/app/frontend/templates/footer.html
index 4a594c35..175c6c12 100644
--- a/app/frontend/templates/footer.html
+++ b/app/frontend/templates/footer.html
@@ -2,12 +2,9 @@
   <footer class="footer">
     <div class="container-fluid ">
 
-<<<<<<< app/frontend/templates/footer.html
-      <span class="text-muted d-block text-center text-sm-left d-sm-inline-block">{{ translate('footer', 'copyright', data['lang']) }} © 2021 - 2022 <a href="https://craftycontrol.com/" target="_blank">Crafty Controller</a>. {{ translate('footer', 'allRightsReserved', data['lang']) }}.</span>
-=======
-      <span class="text-muted d-block text-center text-sm-left d-sm-inline-block">{{ translate('footer', 'copyright', data['lang']) }} © 2021 - 2022 <a href="http://www.craftycontrol.com/" target="_blank">Crafty Controller</a>. {{ translate('footer', 'allRightsReserved', data['lang']) }}.</span>
->>>>>>> app/frontend/templates/footer.html
-      <span class="float-none float-sm-right d-block mt-1 mt-sm-0 text-center">{{ translate('footer', 'version', data['lang']) }}: {{ data['version_data'] }}
+<span class="text-muted d-block text-center text-sm-left d-sm-inline-block">{{ translate('footer', 'copyright', data['lang']) }} © 2021 - 2022 <a href="https://craftycontrol.com/" target="_blank">Crafty Controller</a>. {{ translate('footer', 'allRightsReserved', data['lang']) }}.</span>
+
+<span class="float-none float-sm-right d-block mt-1 mt-sm-0 text-center">{{ translate('footer', 'version', data['lang']) }}: {{ data['version_data'] }}
       </span>
     </div>