From 91fae74e1b33fd640d4cf38a51797e858d1e04c2 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 5 May 2017 09:48:17 +0200
Subject: Merge todo.md and README.md

---
 platform-workshop/README.md | 33 +++++++++++++++++++++++++++++++++
 platform-workshop/todo.md   | 33 ---------------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 platform-workshop/todo.md

diff --git a/platform-workshop/README.md b/platform-workshop/README.md
index 268fdcc..55b53eb 100644
--- a/platform-workshop/README.md
+++ b/platform-workshop/README.md
@@ -4,3 +4,36 @@
 # Generate slides
 
     reveal-ck generate
+
+
+# Todo
+
+## Issues
+
+    May 04 14:26:15    - [wildebeest] Error: Could not set 'file' on ensure: No such file or directory @ dir_s_rmdir - /etc/systemd/system/apache2.service.d/autorestart.conf20170504-20145-1i4pf7u.lock at 21:/srv/leap/puppet/modules/systemd/manifests/unit_file.pp
+
+- keylookup for @leap.se keys doesn't work
+
+### Issues/for later
+
+- figure out vertical slides
+- net-ssh agent error
+- update LEAP/jessie so `leap node init` doesnt take so long
+ 
+- explain ssl certs foo
+- copy paste foo
+
+## CSS
+
+- make headers smaller
+- make code block font bigger
+
+## Images
+
+- for Bitmask
+- where's the Bitmask gif elijah did a while ago ?
+
+## Update Docuementation
+
+- https://leap.se/en/docs/platform/guide/virtual-machines  `leap vm start mynode` not needed anymore
+- Pixelated: https://github.com/pixelated/puppet-pixelated#2-adding-pixelated-to-your-existing-leap-configuration use service instead of custom class
diff --git a/platform-workshop/todo.md b/platform-workshop/todo.md
deleted file mode 100644
index 3e88a9e..0000000
--- a/platform-workshop/todo.md
+++ /dev/null
@@ -1,33 +0,0 @@
-May 04 14:26:15    - [wildebeest] Error: Could not set 'file' on ensure: No such file or directory @ dir_s_rmdir - /etc/systemd/system/apache2.service.d/autorestart.conf20170504-20145-1i4pf7u.lock at 21:/srv/leap/puppet/modules/systemd/manifests/unit_file.pp
-
-
-
-
-
-explain ssl certs foo
-copy paste foo
-
-# CSS
-
-- make headers smaller
-- make code block font bigger
-
-# Images
-
-- for Bitmask
-- where's the Bitmask gif elijah did a while ago ?
-
-# Update Docuementation
-
-- https://leap.se/en/docs/platform/guide/virtual-machines  `leap vm start mynode` not needed anymore
-- Pixelated: https://github.com/pixelated/puppet-pixelated#2-adding-pixelated-to-your-existing-leap-configuration use service instead of custom class
-
-# Issues
-
-- keylookup for @leap.se keys doesn't work
-
-### Issues/for later
-
-- figure out vertical slides
-- net-ssh agent error
-- update LEAP/jessie so `leap node init` doesnt take so long
-- 
cgit v1.2.3