fix automerge errors
Some checks are pending
code check / lint (3.12) (push) Waiting to run
code check / type-checker (3.12) (push) Waiting to run
Mirror to Codeberg / to_codeberg (push) Waiting to run
unit test / django (3.12) (push) Waiting to run

This commit is contained in:
gesang 2025-03-10 18:06:51 +01:00
parent 56f5fe1d11
commit e21d3d4b80
Signed by: gesang
GPG key ID: 6CE35141D31CEAFB

View file

@ -93,10 +93,7 @@ x-shared:
- ${NEODB_DATA:-../data}/takahe-cache:/www/cache - ${NEODB_DATA:-../data}/takahe-cache:/www/cache
- ${NEODB_DATA:-../data}/www-root:/www/root - ${NEODB_DATA:-../data}/www-root:/www/root
- ./custom/edition.custom.html:/neodb/catalog/templates/edition.html - ./custom/edition.custom.html:/neodb/catalog/templates/edition.html
<<<<<<< HEAD
- ./custom/common_libs.custom.html:/neodb/common/templates/common_libs.html - ./custom/common_libs.custom.html:/neodb/common/templates/common_libs.html
=======
>>>>>>> b0ec90060ab08edd9f9fc48cd8125e82dedbafd3
depends_on: depends_on:
- redis - redis
- neodb-db - neodb-db