summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Kohn <justin-kohn@web.de>2018-06-06 00:22:47 +0200
committerJustin Kohn <justin-kohn@web.de>2018-06-06 00:22:47 +0200
commit93ff3ecae404fd8f5bae901eab2caeb6f3ac6c40 (patch)
treef9baafe2763023d2c681c26263f2fbd8c3d85b75
parenta69e0f7f8d7b0b94cab56026e4f9c5976e5cf2df (diff)
downloadwww-93ff3ecae404fd8f5bae901eab2caeb6f3ac6c40.tar.gz
www-93ff3ecae404fd8f5bae901eab2caeb6f3ac6c40.tar.bz2
www-93ff3ecae404fd8f5bae901eab2caeb6f3ac6c40.zip
Programming the flux capacitor
-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