diff --git a/content/events.xml b/content/events.xml
index e020a6439..d9adfae73 100644
--- a/content/events.xml
+++ b/content/events.xml
@@ -2468,6 +2468,11 @@
http://tug-dd.kxpq.de/Home
tug-dd@kxpq.de
+
+ 2015-01-27T21:30:00
+ 2015-01-27T23:00:00
+ radio.html
+
2015-01-28T16:40:00
TU Dresden, Willersbau A221
@@ -2478,6 +2483,11 @@
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/
+
+ 2015-02-24T21:30:00
+ 2015-02-24T23:00:00
+ radio.html
+
2015-03-21T08:30:00
2015-03-22T18:00:00
@@ -2489,6 +2499,11 @@
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/
+
+ 2015-03-24T21:30:00
+ 2015-03-24T23:00:00
+ radio.html
+
2015-04-03
2015-04-06
@@ -2500,16 +2515,31 @@
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/
+
+ 2015-04-28T21:30:00
+ 2015-04-28T23:00:00
+ radio.html
+
2015-05-21T19:00:00
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/
+
+ 2015-05-26T21:30:00
+ 2015-05-26T23:00:00
+ radio.html
+
2015-06-18T19:00:00
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/
+
+ 2015-06-23T21:30:00
+ 2015-06-23T23:00:00
+ radio.html
+
2015-07-16T19:00:00
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
@@ -2545,43 +2575,4 @@
Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig
http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/
-<<<<<<< HEAD
-=======
-
- 2015-04-03
- 2015-04-06
- Braunschweig
- https://eh15.easterhegg.eu/
-
-
- 2015-01-27T21:30:00
- 2015-01-27T23:00:00
- radio.html
-
-
- 2015-02-24T21:30:00
- 2015-02-24T23:00:00
- radio.html
-
-
- 2015-03-24T21:30:00
- 2015-03-24T23:00:00
- radio.html
-
-
- 2015-04-28T21:30:00
- 2015-04-28T23:00:00
- radio.html
-
-
- 2015-05-26T21:30:00
- 2015-05-26T23:00:00
- radio.html
-
-
- 2015-06-23T21:30:00
- 2015-06-23T23:00:00
- radio.html
-
->>>>>>> 07cd4bb15ef8f103b628d8c7b18163db21bbebac