From 93ff3ecae404fd8f5bae901eab2caeb6f3ac6c40 Mon Sep 17 00:00:00 2001
From: Justin Kohn <justin-kohn@web.de>
Date: Wed, 6 Jun 2018 00:22:47 +0200
Subject: Programming the flux capacitor

---
 treffen/2018/05-08-protokoll.html | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3-1-g7c22