Skip to content

Commit 7e6b713

Browse files
galadrilgaladril
committed
Merge remote-tracking branch 'origin/master'
Conflicts: frontpage.html graph.html lights.html logs.html news.html settings/settings.js weather.html
2 parents 7650b4b + eea6460 commit 7e6b713

File tree

7 files changed

+27
-6
lines changed

7 files changed

+27
-6
lines changed

‎frontpage.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@
5555
{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
5656
</script>
5757
<script>
58+
<<<<<<< HEAD
5859
if ($.Camera)
5960
{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
6061
</script>
6162
<script>
63+
=======
64+
>>>>>>> origin/master
6265
if ($.Weather)
6366
{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
6467
</script>
@@ -251,4 +254,4 @@ <h2 id="cell10"></h2>
251254
}
252255
</script>
253256
</body>
254-
</html>
257+
</html>

‎graph.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,13 @@
5656
{document.write('<li class="active"><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
5757
</script>
5858
<script>
59+
<<<<<<< HEAD
5960
if ($.Camera)
6061
{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
6162
</script>
6263
<script>
64+
=======
65+
>>>>>>> origin/master
6366
if ($.Weather)
6467
{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
6568
</script>
@@ -182,4 +185,4 @@ <h4 id="cell10" style="margin-top:-35px;></h4>
182185

183186
</script>
184187
</body>
185-
</html>
188+
</html>

‎lights.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,13 @@
7575
{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
7676
</script>
7777
<script>
78+
<<<<<<< HEAD
7879
if ($.Camera)
7980
{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
8081
</script>
8182
<script>
83+
=======
84+
>>>>>>> origin/master
8285
if ($.Weather)
8386
{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
8487
</script>
@@ -270,4 +273,4 @@
270273

271274
</script>
272275
</body>
273-
</html>
276+
</html>

‎logs.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@
7070
{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
7171
</script>
7272
<script>
73+
<<<<<<< HEAD
7374
if ($.Camera)
7475
{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
7576
</script>
7677
<script>
78+
=======
79+
>>>>>>> origin/master
7780
if ($.Weather)
7881
{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
7982
</script>
@@ -171,4 +174,4 @@
171174

172175
</script>
173176
</body>
174-
</html>
177+
</html>

‎news.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,13 @@
7373
{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
7474
</script>
7575
<script>
76+
<<<<<<< HEAD
7677
if ($.Camera)
7778
{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
7879
</script>
7980
<script>
81+
=======
82+
>>>>>>> origin/master
8083
if ($.Weather)
8184
{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
8285
</script>
@@ -173,4 +176,4 @@
173176
});
174177
</script>
175178
</body>
176-
</html>
179+
</html>

‎settings/settings.js

+3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ $.News = true;//false or true
1818
$.Log = true;//false or true
1919
$.Lights = true;//false or true
2020
$.Weather = true;//false or true
21+
<<<<<<< HEAD
2122
$.Camera = true;//false or true
2223

24+
=======
25+
>>>>>>> origin/master
2326

2427

2528
// Dashboard screen User settings >>>

‎weather.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,13 @@
5858
{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
5959
</script>
6060
<script>
61+
<<<<<<< HEAD
6162
if ($.Camera)
6263
{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
6364
</script>
6465
<script>
66+
=======
67+
>>>>>>> origin/master
6568
if ($.Weather)
6669
{document.write('<li class="active" ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
6770
</script>
@@ -165,4 +168,4 @@
165168
});
166169
</script>
167170
</body>
168-
</html>
171+
</html>

0 commit comments

Comments
 (0)