From 2f573c605e3a17eb07af6c5d6719eab972dc4b86 Mon Sep 17 00:00:00 2001 From: mik-tf Date: Sun, 2 Feb 2025 10:40:26 -0500 Subject: [PATCH] update breaking changes --- docs/main/internet_reinvented/internet_reinvented.md | 4 ---- docs/main/team/ourstory.md | 4 ---- docs/main/team/ourworld.md | 8 -------- 3 files changed, 16 deletions(-) diff --git a/docs/main/internet_reinvented/internet_reinvented.md b/docs/main/internet_reinvented/internet_reinvented.md index 3e62183..a7ded51 100644 --- a/docs/main/internet_reinvented/internet_reinvented.md +++ b/docs/main/internet_reinvented/internet_reinvented.md @@ -18,11 +18,7 @@ All of above is in line with [First Principle Thinking](../first_principle_think ![](img/natural_progression.png) -<<<<<<< HEAD -> We believe ACI is the implementation of Augmented Collective Intelligence. -======= > We believe Web 4 is the implementation of Augmented Collective Intelligence. ->>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3 diff --git a/docs/main/team/ourstory.md b/docs/main/team/ourstory.md index b5dd89e..9c51918 100644 --- a/docs/main/team/ourstory.md +++ b/docs/main/team/ourstory.md @@ -28,8 +28,4 @@ The Web 4 ecosystem continues to expand with groundbreaking innovations: - **3Router**: Encrypted network connectivity. - **3Bot**: Self-healing applications that reduce downtime and improve reliability. -<<<<<<< HEAD -With $65 million in investments and years of development, ACI has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike. -======= With $65 million in investments and years of development, Web 4 has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike. ->>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3 diff --git a/docs/main/team/ourworld.md b/docs/main/team/ourworld.md index f025409..50b1419 100644 --- a/docs/main/team/ourworld.md +++ b/docs/main/team/ourworld.md @@ -18,11 +18,7 @@ OurWorld envisions a transformative future built on the principles of autonomy a By uniting these three pillars of autonomy, OurWorld is building a comprehensive system that empowers individuals and organizations to thrive. This vision seeks to foster a more equitable, resilient, and innovative global society, unlocking the potential for a truly decentralized future. ### **1. TF9** -<<<<<<< HEAD -- **Description**: Next-generation ACI software company. -======= - **Description**: Next-generation Web 4 software company. ->>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3 - **Key Features**: - First platform capable of providing unmatched privacy, security, and unlimited scale. - Lowest possible cost and energy usage for Web 2, 3, and 4. @@ -33,11 +29,7 @@ By uniting these three pillars of autonomy, OurWorld is building a comprehensive --- ### **2. ThreeFold** -<<<<<<< HEAD -- **Description**: Decentralized ACI platform for the world. -======= - **Description**: Decentralized Web 4 platform for the world. ->>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3 - **Key Features**: - Enables a decentralized platform for co-creating the future of the internet. - Incorporates ACI and Augmented Collective Intelligence. -- 2.40.1