fix conflict

This commit is contained in:
2023-05-28 16:17:47 +03:00
67 changed files with 139 additions and 336 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 MiB

After

Width:  |  Height:  |  Size: 415 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 MiB

After

Width:  |  Height:  |  Size: 4.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 MiB

After

Width:  |  Height:  |  Size: 418 KiB

View File

@@ -9,7 +9,9 @@ weight: 2
<!-- section 1 (JP) -->
{% row(style="center narrow" margin="header" bgPath="img/about_header.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/opwhy.jpg" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## About Us
@@ -17,12 +19,7 @@ weight: 2
We are fortunate enough to have found this special place and bold enough to turn our dreams into reality. Together we can show people the beauty of our world and help them find themselves in these hectic times.
<br>
<br>
<br>
<br>
<br>
<br>
</div>
{% end %}
@@ -78,13 +75,13 @@ Primarily we are focused on building **[a decentralized Internet](https://threef
{% row(bgColor="#FFFFFF" margin="moderate" padding="bottom" id="botanical") %}
![Purpose](img/purpose.jpg#medium)
![Purpose](img/purpose.jpg#mx-auto)
|||
### Our Purpose
<p>We aim to provide a space in which people feel at home and can create, live, work, heal, taste, learn, and experience. Eden will be a co-owned space in line with nature which will be fully sustainable and organic. The unique environment around us makes it possible from Chumbe Island to the mangroves, the beach and sea, the ruins, the botanical garden.)</p>
We aim to provide a space in which people feel at home and can create, live, work, heal, taste, learn, and experience. Eden will be a co-owned space in line with nature which will be fully sustainable and organic. The unique environment around us makes it possible from Chumbe Island to the mangroves, the beach and sea, the ruins, the botanical garden.
#### **Now or In-Motion**
@@ -125,6 +122,6 @@ Primarily we are focused on building **[a decentralized Internet](https://threef
|||
![Manifesto](img/manifesto.png#medium)
![Manifesto](img/manifesto.png#mx-auto)
{% end %}