Merge

2024-01-23 17:23:31 +03:00 · 2024-01-23 17:23:31 +03:00 · 0f5319fb7b
commit 0f5319fb7b
parent bc029cd925 dc1d2ebf97
24 changed files with 4 additions and 0 deletions
--- a/info_duniayetu/src/SUMMARY.md
+++ b/info_duniayetu/src/SUMMARY.md
--- a/info_duniayetu/src/dunia_yetu/about_us.md
+++ b/info_duniayetu/src/dunia_yetu/about_us.md
--- a/info_duniayetu/src/dunia_yetu/img/dunia.png
+++ b/info_duniayetu/src/dunia_yetu/img/dunia.png
--- a/info_duniayetu/src/dunia_yetu/dunia_yetu.md
+++ b/info_duniayetu/src/dunia_yetu/dunia_yetu.md
@ -1,6 +1,10 @@
 # Dunia Yetu 

+<<<<<<< HEAD:info_duniayetu/src/dunia_yetu/dunia_yetu.md
 ![Image](img/home_image.jpeg#medium#mx-auto)
+=======
+![Image](dunia.png)
+>>>>>>> dc1d2ebf970d1693342964a35124313953b63984:src/dunia_yetu/dunia_yetu.md

 ## Contents

--- a/src/dunia_yetu/img/dunia.png
+++ b/src/dunia_yetu/img/dunia.png
--- a/info_duniayetu/src/dunia_yetu/img/home_image.jpeg
+++ b/info_duniayetu/src/dunia_yetu/img/home_image.jpeg
--- a/info_duniayetu/src/dunia_yetu/img/values.jpeg
+++ b/info_duniayetu/src/dunia_yetu/img/values.jpeg
--- a/src/dunia_yetu/offer.png
+++ b/src/dunia_yetu/offer.png
--- a/info_duniayetu/src/dunia_yetu/our_core_values.md
+++ b/info_duniayetu/src/dunia_yetu/our_core_values.md
--- a/info_duniayetu/src/how_you_can_participate/build.md
+++ b/info_duniayetu/src/how_you_can_participate/build.md
--- a/info_duniayetu/src/how_you_can_participate/img/build.png
+++ b/info_duniayetu/src/how_you_can_participate/img/build.png
--- a/info_duniayetu/src/how_you_can_participate/coding_participate.md
+++ b/info_duniayetu/src/how_you_can_participate/coding_participate.md
--- a/info_duniayetu/src/how_you_can_participate/community_participate.md
+++ b/info_duniayetu/src/how_you_can_participate/community_participate.md
--- a/info_duniayetu/src/how_you_can_participate/earnTFT.md
+++ b/info_duniayetu/src/how_you_can_participate/earnTFT.md
--- a/info_duniayetu/src/how_you_can_participate/host_a_node.md
+++ b/info_duniayetu/src/how_you_can_participate/host_a_node.md
--- a/src/how_you_can_participate/img/build.png
+++ b/src/how_you_can_participate/img/build.png
--- a/info_duniayetu/src/how_you_can_participate/img/node.png
+++ b/info_duniayetu/src/how_you_can_participate/img/node.png
--- a/info_duniayetu/src/how_you_can_participate/img/participate.png
+++ b/info_duniayetu/src/how_you_can_participate/img/participate.png
--- a/info_duniayetu/src/how_you_can_participate/img/tft.png
+++ b/info_duniayetu/src/how_you_can_participate/img/tft.png
--- a/src/how_you_can_participate/node.png
+++ b/src/how_you_can_participate/node.png
--- a/info_duniayetu/src/how_you_can_participate/node_build.md
+++ b/info_duniayetu/src/how_you_can_participate/node_build.md
--- a/info_duniayetu/src/how_you_can_participate/participate.md
+++ b/info_duniayetu/src/how_you_can_participate/participate.md
--- a/src/how_you_can_participate/participate.png
+++ b/src/how_you_can_participate/participate.png
--- a/src/how_you_can_participate/tft.png
+++ b/src/how_you_can_participate/tft.png