Fix merge confilcts

This commit is contained in:
chabad360 2019-02-25 23:59:23 -05:00 committed by Mendel Greenberg
commit eab03fffd0
No known key found for this signature in database
GPG key ID: B26A7D2DF7DC6EF7

View file

@ -29,6 +29,7 @@ services:
redis-queue:
image: redis:alpine
volumes:
- ./conf/redis-conf.d:/etc/conf.d