fix automerge errors
This commit is contained in:
parent
56f5fe1d11
commit
e21d3d4b80
1 changed files with 0 additions and 3 deletions
|
@ -93,10 +93,7 @@ x-shared:
|
|||
- ${NEODB_DATA:-../data}/takahe-cache:/www/cache
|
||||
- ${NEODB_DATA:-../data}/www-root:/www/root
|
||||
- ./custom/edition.custom.html:/neodb/catalog/templates/edition.html
|
||||
<<<<<<< HEAD
|
||||
- ./custom/common_libs.custom.html:/neodb/common/templates/common_libs.html
|
||||
=======
|
||||
>>>>>>> b0ec90060ab08edd9f9fc48cd8125e82dedbafd3
|
||||
depends_on:
|
||||
- redis
|
||||
- neodb-db
|
||||
|
|
Loading…
Add table
Reference in a new issue