From 8da1ccdc130d156f20072c276d431d29ff03de15 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Thu, 21 Oct 2021 22:43:22 +0200
Subject: [PATCH] Default commit message, part of an automated flow.

---
 dns.md                | 1 +
 journal/2021-10-21.md | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dns.md b/dns.md
index 6f2070a30..7234bd939 100644
--- a/dns.md
+++ b/dns.md
@@ -1,6 +1,7 @@
 # dns
 
 - a [[system]].
+  - [[hierarchical]] [[decentralized]]
   - [[domain name system]]
     - [[wp]] https://en.wikipedia.org/wiki/Domain_Name_System
 - a [[thing]].
diff --git a/journal/2021-10-21.md b/journal/2021-10-21.md
index 795e491d1..f0e891810 100644
--- a/journal/2021-10-21.md
+++ b/journal/2021-10-21.md
@@ -13,7 +13,4 @@
   - [[robert axelrod]]
 - [[vanguard]]
 - [[mr green]]
-<<<<<<< HEAD
 - [[dns]]
-=======
->>>>>>> 8a8056487b9d732163fee1e659c50c74f5f542e8