From 6f4d67c37d79a2d88aba502c58047cc927e3fd15 Mon Sep 17 00:00:00 2001
From: mole <mole@mopox.de>
Date: Mon, 16 Sep 2019 19:28:02 +0200
Subject: [PATCH] - merge conflicts

---
 content/static/datenspuren/2019/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/content/static/datenspuren/2019/index.html b/content/static/datenspuren/2019/index.html
index f81321c95..bb77421cb 100644
--- a/content/static/datenspuren/2019/index.html
+++ b/content/static/datenspuren/2019/index.html
@@ -227,12 +227,8 @@
           </aside>
           <section class="col-md-12">
             <h1 class="display-2">Datenspuren 2019</h1>
-<<<<<<< HEAD
             <p class="display-4">21. &ndash; 22. September</p>
             <p>20. September (Vorprogramm)</p>
-=======
-            <p class="display-4">20. &ndash; 22. September</p>
->>>>>>> f6b5020b46b2b7c2fee668c9b13c9dcaca5f8923
             <p class="lead">Eine Konferenz des<br />Chaos Computer Club Dresden</p>
             <p><a href="#idProgram" style="color: red !important; font-size: 2em">Fahrplan online <i class="fas fa-arrow-left"></i></a></p>
             <p>