ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflict resolved docker-compose file

This commit is contained in:
ZeroC0D3 Team 2017-03-18 08:29:14 +07:00
parent 2bbe39cf4a
commit d31ccbd268
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -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: