From cf2065cc0730406c48df372c46d535aff2020f2c Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Thu, 16 May 2024 12:58:06 -0400 Subject: [PATCH 1/2] tech updated mycelium --- collections/tech/primitives/network/mycelium.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/collections/tech/primitives/network/mycelium.md b/collections/tech/primitives/network/mycelium.md index 86ca200..af01615 100644 --- a/collections/tech/primitives/network/mycelium.md +++ b/collections/tech/primitives/network/mycelium.md @@ -1,18 +1,9 @@ - -<<<<<<< HEAD -# Mycelium: Our Planetary Network as used in the TFGrid - +# Mycelium: Our Planetary Network ![alt text](img/mycelium.png) -======= -# Mycelium: Our Planetary Network The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. -![](img/planet_net_.jpg) - In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall. ->>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c - !!wiki.include page:'tech:mycelium_incl.md' \ No newline at end of file From 3e0d1cb1e4395736b805e740655c198ececa4f49 Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Thu, 16 May 2024 13:05:38 -0400 Subject: [PATCH 2/2] refixed stuff that should be fixed --- collections/partners_utilization/vindo.md | 2 +- heroscript/tech/book_collections.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/collections/partners_utilization/vindo.md b/collections/partners_utilization/vindo.md index 3775162..237b82b 100644 --- a/collections/partners_utilization/vindo.md +++ b/collections/partners_utilization/vindo.md @@ -1 +1 @@ -!!wiki.include page:'vindo:vindo' +!!wiki.include page:'vindo:vindo' \ No newline at end of file diff --git a/heroscript/tech/book_collections.md b/heroscript/tech/book_collections.md index 85b5a9e..8fb4f94 100644 --- a/heroscript/tech/book_collections.md +++ b/heroscript/tech/book_collections.md @@ -18,4 +18,10 @@ !!doctree.add url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization' +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/vindo' + +!!doctree.add + url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/mkondo' + ``` \ No newline at end of file