- merge conflicts

2019-09-16 19:28:02 +02:00 · 2019-09-16 19:28:02 +02:00 · 6f4d67c37d
parent ffd0511235
commit 6f4d67c37d
1 changed files with 0 additions and 4 deletions
--- 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>