From dfe9c9348d24ced2156c0ae9fcf6c6d9d68b3c1f Mon Sep 17 00:00:00 2001
From: Jocavdh <joca@madebyjoca.com>
Date: Wed, 13 Jun 2018 13:55:37 +0200
Subject: [PATCH] Fixed conflict in base.html

---
 app/templates/base.html | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index c7601da..f2cb919 100755
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -43,17 +43,12 @@
 
     {% block js %} {% endblock%}
 
-<<<<<<< HEAD
-    <script type="text/javascript" src="http://code.jquery.com/jquery-2.2.4.js"></script>
-    <script type="text/javascript" src="http://code.jquery.com/ui/1.12.0/jquery-ui.js"></script>
-<script type='text/javascript' src='//cdn.jsdelivr.net/jquery.marquee/1.4.0/jquery.marquee.min.js'></script>
-=======
-    <script src="{{ url_for("static", filename="js/jquery-3.3.1.min.js") }}"></script>
-        <script src="{{ url_for("static", filename="js/jquery-ui-1.12.1.custom/jquery-ui.js") }}"></script>
+
+<script src="{{ url_for("static", filename="js/jquery-3.3.1.min.js") }}"></script>
+<script src="{{ url_for("static", filename="js/jquery-ui-1.12.1.custom/jquery-ui.js") }}"></script>
 <script src="{{ url_for("static", filename="js/jquery.marquee.min.js") }}"></script>
->>>>>>> 0f5e5606ab9152e9d27e7081e251e12a7f33824b
-  <script type="text/javascript" src="{{ url_for("static", filename="js/jquery.tablesorter.js") }}"></script>
-    <script src="{{ url_for("static", filename="js/app.js") }}"></script>
+<script type="text/javascript" src="{{ url_for("static", filename="js/jquery.tablesorter.js") }}"></script>
+<script src="{{ url_for("static", filename="js/app.js") }}"></script>
 
 <script src="{{ url_for("static", filename="js/vendor/socket.io.slim.js") }}"></script>
 <script src="{{ url_for("static", filename="js/vendor/vue.min.js") }}"></script>