kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Yaman Qalieh 2018-01-20 23:03:17 -05:00
commit 92b1d6d02f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SmearcarDB/static/index.js
View File

@ -1,5 +1,5 @@
var navSelect = "home"; var navSelect = "home";
var serverURL = "http://0.0.0.0:5000"; var serverURL = "http://localhost:5000";
var data; var data;
var navi = [ // Array containing navigation items in form [Font-Awesome class name, Display Text, Onclick function]. var navi = [ // Array containing navigation items in form [Font-Awesome class name, Display Text, Onclick function].

2
SmearcarDB/templates/index.html
View File

@ -14,7 +14,7 @@
</head> </head>
<body> <body>
<div id="header1" class="colorFade"> <div id="header1" class="transition">
<h1>/smirkär/</h1> <h1>/smirkär/</h1>
</div> </div>
<div id="header2"> <div id="header2">