From d892fdf6ebb2144fc57ff14cf636e3a88bb5f602 Mon Sep 17 00:00:00 2001
From: bernd2k <bernd2k@aerospaceresearch.net>
Date: Tue, 13 Feb 2018 00:41:52 +0100
Subject: [PATCH] next

next
---
 status.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/status.json b/status.json
index c985492..c6cb3c4 100644
--- a/status.json
+++ b/status.json
@@ -41,7 +41,6 @@
             "text": "Wir sind nun zu. Wie sieht es bei euch aus im c3d2 @pentafnord? #Dresden"
         },
         {
-            "text": "...aaaaan it's gone! Krautspace is closed https://www.youtube.com/watch?v=DNLob2E_Q5s"
             "text": "...aaaaand it's gone! Krautspace is closed https://www.youtube.com/watch?v=DNLob2E_Q5s"
         },
         {
@@ -92,7 +91,6 @@
             "text": "Today is a good day to DIY! Krautspace is open."
         },
         {
-<<<<<<< HEAD
             "text": "Want to learn to hack hardware? Come to Krautspace now and start by taking things apart."
         },
         {
@@ -107,11 +105,12 @@
         {
             "text": "Come on over and have some fun! The space is open"
 =======
+		},
+		{
             "text": "The more you know! Krautspace is open. http://i3.kym-cdn.com/photos/images/newsfeed/000/620/434/f9e.gif"
         },
         {
             "text": "Come to the Krautspace now, we have Mate!"
->>>>>>> 05377e99a30bbae7ab6dcc1a1c6dcec46cfc5c01
         }
     ],
     "uncertain_text": [