From e361347f03ce04a637ca3d5d980463c5060ed808 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@matt.wf>
Date: Mon, 11 Feb 2019 14:09:00 +0100
Subject: [PATCH] Use alphabetical order in directory.json

---
 README.md      |  4 ++++
 directory.json | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index b1e568e..94da354 100644
--- a/README.md
+++ b/README.md
@@ -8,5 +8,9 @@ Please [introduce yourself] and provide a pull request adding your available `/l
 
 For more information on the `librehost.json` format and schema see https://lab.libreho.st/librehosters/librehost-api
 
+## Add entry to directory.json
+
+Please make sure that you add your new entry in alphabetical order to avoid merge conflicts.
+
 [introduce yourself]: https://talk.libreho.st/t/introductions/29
 [librehosters network]: https://talk.libreho.st/group/network
diff --git a/directory.json b/directory.json
index 924f325..3cb0d7b 100644
--- a/directory.json
+++ b/directory.json
@@ -1,12 +1,12 @@
 {
-"weho.st" : "https://weho.st/librehost.json",
-"Petites Singularités" : "https://ps.lesoiseaux.io/librehost.json",
-"lain haus" : "https://lain.haus/librehost.json",
-"Indie.Host" : "https://indie.host/librehost.json",
 "aktivix.org" : "https://aktivix.org/librehost.json",
-"Webarchitects Cooperative" : "https://www.webarchitects.coop/librehost-api/librehost.json",
+"Disroot.org" : "https://disroot.org/librehost/librehost.json",
 "hackerspaces.be" : "https://hackerspaces.be/librehost.json",
-"snopyta.org" : "https://snopyta.org/librehost.json",
+"Indie.Host" : "https://indie.host/librehost.json",
+"lain haus" : "https://lain.haus/librehost.json",
 "LibreOps" : "https://libreops.cc/librehost.json",
-"Disroot.org" : "https://disroot.org/librehost/librehost.json"
+"Petites Singularités" : "https://ps.lesoiseaux.io/librehost.json",
+"snopyta.org" : "https://snopyta.org/librehost.json",
+"Webarchitects Cooperative" : "https://www.webarchitects.coop/librehost-api/librehost.json",
+"weho.st" : "https://weho.st/librehost.json"
 }
-- 
GitLab