fix rebase mistake

This commit is contained in:
chandi 2020-12-23 13:33:39 +01:00
parent f0e734a2cf
commit 9ac7e309de

View File

@ -205,11 +205,8 @@ volumes:
bigbluebutton:
vol-freeswitch:
vol-kurento:
<<<<<<< HEAD
html5-static:
=======
vol-libreoffice:
>>>>>>> b6193c1 (v2.3: dockerized libreoffice)
networks:
bbb-net: