fixed conflicts (LOL merge -s ours; push -f)

Browse Source

...

This commit is contained in:

konsthol

2023-10-18 22:44:27 +03:00

commit 3b4c1171ef

18 changed files with 1164 additions and 0 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

Figures/aegean_logo.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 178 KiB

BIN

Figures/aegean_logo2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.6 KiB

BIN

Figures/aegean_logo3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 92 KiB

BIN

Figures/aegean_logo_nocolors.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 79 KiB

BIN

Figures/aegean_logo_older.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB