From de7522a07cacceeceb6e4492c906afb057149988 Mon Sep 17 00:00:00 2001
From: vv01f <vv01f@debwatch>
Date: Fri, 26 Dec 2014 22:13:04 +0100
Subject: [PATCH] doublette geloescht, termine geordnet

---
 content/events.xml | 69 ++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

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 @@
 		<link>http://tug-dd.kxpq.de/Home</link>
 		<mail>tug-dd@kxpq.de</mail>
 	</event>
+	<event title="Pentaradio">
+		<start>2015-01-27T21:30:00</start>
+		<end>2015-01-27T23:00:00</end>
+		<link>radio.html</link>
+	</event>
 	<event title="Python for Science (inkl. Sage)">
 		<start>2015-01-28T16:40:00</start>
 		<location>TU Dresden, Willersbau A221</location>
@@ -2478,6 +2483,11 @@
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
 		<link>http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/</link>
 	</event>
+	<event title="Pentaradio">
+		<start>2015-02-24T21:30:00</start>
+		<end>2015-02-24T23:00:00</end>
+		<link>radio.html</link>
+	</event>
 	<event title="Chemnitzer Linux-Tage">
 		<start>2015-03-21T08:30:00</start>
 		<end>2015-03-22T18:00:00</end>
@@ -2489,6 +2499,11 @@
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
 		<link>http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/</link>
 	</event>
+	<event title="Pentaradio">
+		<start>2015-03-24T21:30:00</start>
+		<end>2015-03-24T23:00:00</end>
+		<link>radio.html</link>
+	</event>
 	<event title="easterhegg">
 		<start>2015-04-03</start>
 		<end>2015-04-06</end>
@@ -2500,16 +2515,31 @@
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
 		<link>http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/</link>
 	</event>
+	<event title="Pentaradio">
+		<start>2015-04-28T21:30:00</start>
+		<end>2015-04-28T23:00:00</end>
+		<link>radio.html</link>
+	</event>
 	<event title="Bitcoin Stammtisch Leipzig">
 		<start>2015-05-21T19:00:00</start>
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
 		<link>http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/</link>
 	</event>
+	<event title="Pentaradio">
+		<start>2015-05-26T21:30:00</start>
+		<end>2015-05-26T23:00:00</end>
+		<link>radio.html</link>
+	</event>
 	<event title="Bitcoin Stammtisch Leipzig">
 		<start>2015-06-18T19:00:00</start>
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
 		<link>http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/</link>
 	</event>
+	<event title="Pentaradio">
+		<start>2015-06-23T21:30:00</start>
+		<end>2015-06-23T23:00:00</end>
+		<link>radio.html</link>
+	</event>
 	<event title="Bitcoin Stammtisch Leipzig">
 		<start>2015-07-16T19:00:00</start>
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
@@ -2545,43 +2575,4 @@
 		<location>Cafe Puschkin, Karl-Liebknecht-Straße 74, Leipzig</location>
 		<link>http://www.meetup.com/Leipziger-Bitcoin-Stammtisch/</link>
 	</event>
-<<<<<<< HEAD
-=======
-	<event title="easterhegg">
-		<start>2015-04-03</start>
-		<end>2015-04-06</end>
-		<location>Braunschweig</location>
-		<link>https://eh15.easterhegg.eu/</link>
-	</event>
-	<event title="Pentaradio">
-		<start>2015-01-27T21:30:00</start>
-		<end>2015-01-27T23:00:00</end>
-		<link>radio.html</link>
-	</event>
-	<event title="Pentaradio">
-		<start>2015-02-24T21:30:00</start>
-		<end>2015-02-24T23:00:00</end>
-		<link>radio.html</link>
-	</event>
-	<event title="Pentaradio">
-		<start>2015-03-24T21:30:00</start>
-		<end>2015-03-24T23:00:00</end>
-		<link>radio.html</link>
-	</event>
-	<event title="Pentaradio">
-		<start>2015-04-28T21:30:00</start>
-		<end>2015-04-28T23:00:00</end>
-		<link>radio.html</link>
-	</event>
-	<event title="Pentaradio">
-		<start>2015-05-26T21:30:00</start>
-		<end>2015-05-26T23:00:00</end>
-		<link>radio.html</link>
-	</event>
-	<event title="Pentaradio">
-		<start>2015-06-23T21:30:00</start>
-		<end>2015-06-23T23:00:00</end>
-		<link>radio.html</link>
-	</event>
->>>>>>> 07cd4bb15ef8f103b628d8c7b18163db21bbebac
 </calendar>