From 629b95d0ae3ebd8a5e46d39c4c73faa9e550df35 Mon Sep 17 00:00:00 2001
From: baldo <baldo@toppoint.de>
Date: Sat, 12 Sep 2015 13:55:26 +0200
Subject: [PATCH] Schedule update

---
 ffnord-con-2015-2/room/schedule.json | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ffnord-con-2015-2/room/schedule.json b/ffnord-con-2015-2/room/schedule.json
index d35181d..b943873 100644
--- a/ffnord-con-2015-2/room/schedule.json
+++ b/ffnord-con-2015-2/room/schedule.json
@@ -66,20 +66,6 @@
         "unix_end": 1442064600
     },
 
-    {
-        "duration": 120,
-        "lang": "de",
-        "place": "NÄHSTUBE",
-        "speakers": [
-            "DO9XE"
-        ],
-        "start": "14:00",
-        "title": "Workshop - ffnord-Netz aufsetzen",
-        "type": "talk",
-        "unix": 1442059200,
-        "unix_end": 1442066400
-    },
-
     {
         "duration": 60,
         "lang": "de",
@@ -94,6 +80,20 @@
         "unix_end": 1442070000
     },
 
+    {
+        "duration": 120,
+        "lang": "de",
+        "place": "NÄHSTUBE",
+        "speakers": [
+            "DO9XE"
+        ],
+        "start": "16:00",
+        "title": "Workshop - ffnord-Netz aufsetzen",
+        "type": "talk",
+        "unix": 1442066400,
+        "unix_end": 1442073600
+    },
+
     {
         "duration": 240,
         "lang": "de",
@@ -108,15 +108,15 @@
     },
 
     {
-        "duration": 240,
+        "duration": 180,
         "lang": "de",
         "place": "NÄHSTUBE",
         "speakers": [
         ],
-        "start": "16:00",
+        "start": "18:00",
         "title": "Workshop und Hacking Time",
         "type": "talk",
-        "unix": 1442066400,
+        "unix": 1442073600,
         "unix_end": 1442080800
     },