fix conflict

Browse Source

...

This commit is contained in:

Ehab Hassan

2023-05-28 16:17:47 +03:00

parent 9c55ad57a7 268f349193

commit 2b0e268d61

67 changed files with 139 additions and 336 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

content/activities/img/activities_header_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 MiB After Width:  |  Height:  |  Size: 2.4 MiB

BIN

content/activities/img/boats.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 MiB After Width:  |  Height:  |  Size: 1.7 MiB

BIN

content/activities/img/gardens.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.0 MiB After Width:  |  Height:  |  Size: 3.3 MiB

BIN

content/activities/img/mangroves.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 MiB After Width:  |  Height:  |  Size: 3.5 MiB

BIN

content/activities/img/relax.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 MiB After Width:  |  Height:  |  Size: 2.6 MiB

BIN

content/activities/img/ruins.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 MiB After Width:  |  Height:  |  Size: 2.3 MiB