Resolve merge conflict in docker-compose.yml

Browse Source

...

This commit is contained in:

DigiServer Developer

2025-09-09 15:29:21 +03:00

parent 0f34a47fa9 3cc703a7d1

commit 9cb32da13c

7 changed files with 11 additions and 9 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

app/static/resurse/login_picture.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 153 KiB

BIN

app/static/resurse/logo.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 52 KiB

BIN

app/static/uploads/big-buck-bunny-1080p-60fps-30sec.mp4

Binary file not shown.

BIN

app/static/uploads/call-of-duty-black-3840x2160-23674.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.5 MiB

BIN

app/static/uploads/demo2.jpeg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 537 KiB

BIN

app/static/uploads/one-piece-season-2-5120x2880-23673.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.2 MiB