forked from extern/docker
fix rebase mistake
This commit is contained in:
parent
f0e734a2cf
commit
9ac7e309de
@ -205,11 +205,8 @@ volumes:
|
||||
bigbluebutton:
|
||||
vol-freeswitch:
|
||||
vol-kurento:
|
||||
<<<<<<< HEAD
|
||||
html5-static:
|
||||
=======
|
||||
vol-libreoffice:
|
||||
>>>>>>> b6193c1 (v2.3: dockerized libreoffice)
|
||||
|
||||
networks:
|
||||
bbb-net:
|
||||
|
Loading…
Reference in New Issue
Block a user