next
This commit is contained in:
bernd2k 2018-02-13 00:41:52 +01:00
parent a1225f2f54
commit d892fdf6eb

View file

@ -41,7 +41,6 @@
"text": "Wir sind nun zu. Wie sieht es bei euch aus im c3d2 @pentafnord? #Dresden" "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" "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." "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." "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": "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": "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!" "text": "Come to the Krautspace now, we have Mate!"
>>>>>>> 05377e99a30bbae7ab6dcc1a1c6dcec46cfc5c01
} }
], ],
"uncertain_text": [ "uncertain_text": [