Default commit message, part of an automated flow.

2026-07-31 11:36:19 +00:00 · 2021-10-21 22:43:22 +02:00
parent 0f147da823
commit 8da1ccdc13
2 changed files with 1 additions and 3 deletions
@@ -1,6 +1,7 @@
 # dns

 - a [[system]].
+  - [[hierarchical]] [[decentralized]]
  - [[domain name system]]
    - [[wp]] https://en.wikipedia.org/wiki/Domain_Name_System
 - a [[thing]].
@@ -13,7 +13,4 @@
  - [[robert axelrod]]
 - [[vanguard]]
 - [[mr green]]
-<<<<<<< HEAD
 - [[dns]]
-=======
->>>>>>> 8a8056487b9d732163fee1e659c50c74f5f542e8