From d081d478a9096b4da64d3664320968d8a0501e0b Mon Sep 17 00:00:00 2001 From: gorhgorh Date: Mon, 25 Apr 2016 12:33:33 +0200 Subject: [PATCH] cleanup and update --- accepted/federated.md | 2 +- {accepted => inFlux}/ToolboxforCyberneticTotalitarianism.md | 4 +++- {accepted => inFlux}/privileged-service.md | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) rename {accepted => inFlux}/ToolboxforCyberneticTotalitarianism.md (83%) rename {accepted => inFlux}/privileged-service.md (93%) diff --git a/accepted/federated.md b/accepted/federated.md index 41a2810..a582fbd 100644 --- a/accepted/federated.md +++ b/accepted/federated.md @@ -1,6 +1,6 @@ # Infos -auth-name : ??? +auth-name : Ksenia need travel fee : appreciated, if possible need room : no diff --git a/accepted/ToolboxforCyberneticTotalitarianism.md b/inFlux/ToolboxforCyberneticTotalitarianism.md similarity index 83% rename from accepted/ToolboxforCyberneticTotalitarianism.md rename to inFlux/ToolboxforCyberneticTotalitarianism.md index ef7a52b..4dcd1d2 100644 --- a/accepted/ToolboxforCyberneticTotalitarianism.md +++ b/inFlux/ToolboxforCyberneticTotalitarianism.md @@ -1,6 +1,6 @@ # Infos -auth-name : ??? +auth-name : Ksenia need travel fee : appreciated, if possible need room : no @@ -11,3 +11,5 @@ Location : UK This would be a very short talk that I would like to become a discussion as quickly as possible.The aim is not so much mapping out and going over the things which creep us out: such as for example blockchains and linked data but to invite people to look at the dystopia scenarios, set of tools and strategies which which might come in handy for navigating cybernetic totalitarianism. It is really a continuation of several long and short conversations I had with quite a few people, at least two of them will be amongst the attendees. + +## ksenia choosed this talk between the 2 she made we will see if we can put this one somewhere sometime \ No newline at end of file diff --git a/accepted/privileged-service.md b/inFlux/privileged-service.md similarity index 93% rename from accepted/privileged-service.md rename to inFlux/privileged-service.md index 6923234..02f66ab 100644 --- a/accepted/privileged-service.md +++ b/inFlux/privileged-service.md @@ -12,3 +12,5 @@ Location : Freiburg, Germany, Earth Privilege is nothing someone should feel guilty for, it rather should remind us of the responsibilty that we have, to profoundly serve the people around us. Extending from this, the things we build and the way we interact with one another should reflect this responsibilty. + +## awaiting confirmation from friedel \ No newline at end of file