dorian/blueweather
dorian/blueweather
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed stuff from merge conflict

Browse source
This commit is contained in:
Dorian Zedler 2019-07-22 22:46:05 +02:00
parent d93f07b3eb
commit 86189de537
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index.html
View file

@ -61,8 +61,6 @@
<div class="my-3 p-3 bg-white rounded shadow-sm"> <div class="my-3 p-3 bg-white rounded shadow-sm">
<h6 class="border-bottom border-gray pb-2 mb-0">current places</h6> <h6 class="border-bottom border-gray pb-2 mb-0">current places</h6>
<<<<<<< HEAD
<<<<<<< Updated upstream
<div id="locationsList"> <div id="locationsList">
<div class="media text-muted pt-3"> <div class="media text-muted pt-3">
@ -92,7 +90,6 @@
Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
condimentum nibh, ut fermentum massa justo sit amet risus. condimentum nibh, ut fermentum massa justo sit amet risus.
</p> </p>
<<<<<<< Updated upstream
</div> </div>
<div class="media text-muted pt-3"> <div class="media text-muted pt-3">
<!-- <svg class="bd-placeholder-img mr-2 rounded" width="32" height="32" xmlns="http://www.w3.org/2000/svg" <!-- <svg class="bd-placeholder-img mr-2 rounded" width="32" height="32" xmlns="http://www.w3.org/2000/svg"
@ -122,9 +119,7 @@
Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
condimentum nibh, ut fermentum massa justo sit amet risus. condimentum nibh, ut fermentum massa justo sit amet risus.
</p> </p>
<<<<<<< HEAD
</div> </div>
=======
</div> </div>
<div class="media text-muted pt-3"> <div class="media text-muted pt-3">