merge conflict

2018-01-20 23:03:17 -05:00 · 2018-01-20 23:03:17 -05:00 · 92b1d6d02f
commit 92b1d6d02f
parent a04a7d0ba9 7ce57e85a0
2 changed files with 2 additions and 2 deletions
--- a/SmearcarDB/static/index.js
+++ b/SmearcarDB/static/index.js
@ -1,5 +1,5 @@
 var navSelect = "home";
-var serverURL = "http://0.0.0.0:5000";
+var serverURL = "http://localhost:5000";
 var data;

 var navi = [ // Array containing navigation items in form [Font-Awesome class name, Display Text, Onclick function].
--- a/SmearcarDB/templates/index.html
+++ b/SmearcarDB/templates/index.html
@ -14,7 +14,7 @@
 </head>

 <body>
-    <div id="header1" class="colorFade">
+    <div id="header1" class="transition">
        <h1>/smirkär/</h1>
    </div>
    <div id="header2">