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: 778 KiB

After

Width:  |  Height:  |  Size: 461 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 KiB

After

Width:  |  Height:  |  Size: 426 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 744 KiB

After

Width:  |  Height:  |  Size: 443 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 792 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 MiB

After

Width:  |  Height:  |  Size: 746 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 681 KiB

View File

@@ -9,7 +9,9 @@ weight: 4
<!-- section 1 (JP) -->
{% row(style="center narrow" margin="header" bgPath="img/protection_header.png" bgStyle="full") %}
{% row(style="center narrow" margin="tight" bgPath="img/protectheader.jpg" bgStyle="full") %}
<div class="bg-gray-200/50 py-4 px-4 rounded-md">
## Programs to Protect
@@ -19,12 +21,7 @@ By creating our own paradise we have a responsibility to the planet. Most of the
<button>[Support the Project](/action)</button>
<br>
<br>
<br>
<br>
<br>
<br>
</div>
{% end %}