summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--treffen/2018/05-08-protokoll.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/treffen/2018/05-08-protokoll.html b/treffen/2018/05-08-protokoll.html
index b7c4023..68d8890 100644
--- a/treffen/2018/05-08-protokoll.html
+++ b/treffen/2018/05-08-protokoll.html
@@ -3,7 +3,6 @@
{% mark body %}
{% filter rst %}
-<<<<<<< HEAD
=======
Splinetreffen am Dienstag, den 8. Mai 2018, 18 Uhr