Conflict resolved docker-compose file
This commit is contained in:
parent
2bbe39cf4a
commit
d31ccbd268
@ -249,7 +249,6 @@ services:
|
|||||||
- "3002:3002"
|
- "3002:3002"
|
||||||
- "3003:3003"
|
- "3003:3003"
|
||||||
|
|
||||||
|
|
||||||
### Memcached Container #####################################
|
### Memcached Container #####################################
|
||||||
|
|
||||||
memcached:
|
memcached:
|
||||||
@ -360,7 +359,6 @@ services:
|
|||||||
- CN="fake.domain.com"
|
- CN="fake.domain.com"
|
||||||
- EMAIL="fake.email@gmail.com"
|
- EMAIL="fake.email@gmail.com"
|
||||||
|
|
||||||
|
|
||||||
### Mailhog Container #########################################
|
### Mailhog Container #########################################
|
||||||
|
|
||||||
mailhog:
|
mailhog:
|
||||||
|
Loading…
Reference in New Issue
Block a user