From 8faf98578d4d5a7c398aa035bf692a288109a3ef Mon Sep 17 00:00:00 2001 From: Merlijn Sebrechts Date: Sat, 28 Apr 2018 23:21:37 +0200 Subject: [PATCH] merge --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 6eb5485..1f2a64e 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,7 @@ We created our very own Ghent hackerspace. We had two rules: be excellent to eac We knew that, in order to fix this, we needed a system that gets the best out of everyone and enables us to be awesome! After long late-night discussions, we came up with HTH. *This git repository contains the organizational structure of our hackerspace. This is intended to be place-agnostic information so it can be used by other hackerspaces around the world.* -<<<<<<< HEAD This is divided into 3 parts. -======= -This is divided into 3 parts. Because [naming things is very hard](http://xkcd.com/910/) we decided to use the names from the ["Silo" series of Hugh Howey](http://en.wikipedia.org/wiki/Silo_%28series%29). The series follows the life of several people living in underground silos in a post-apocalyptic society. ->>>>>>> 4d4ece810837524bba901470d3500b0e7a40c863 ### [1. The System](./system)