From 86189de5370ab3dac84e9551cf64e4b4e4a2e2c6 Mon Sep 17 00:00:00 2001
From: dorian <dorian@itsblue.de>
Date: Mon, 22 Jul 2019 22:46:05 +0200
Subject: [PATCH] fixed stuff from merge conflict

---
 index.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/index.html b/index.html
index d8e6398..86d5287 100644
--- a/index.html
+++ b/index.html
@@ -61,8 +61,6 @@
 
     <div class="my-3 p-3 bg-white rounded shadow-sm">
       <h6 class="border-bottom border-gray pb-2 mb-0">current places</h6>
-<<<<<<< HEAD
-<<<<<<< Updated upstream
       <div id="locationsList">
         <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
             condimentum nibh, ut fermentum massa justo sit amet risus.
           </p>
-<<<<<<< Updated upstream
         </div>
         <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"
@@ -122,9 +119,7 @@
             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.
           </p>
-<<<<<<< HEAD
         </div>
-=======
       </div>
 
       <div class="media text-muted pt-3">