Merge conflicts

This commit is contained in:
Fergal Moran
2015-10-05 19:16:44 +00:00

View File

@@ -83,5 +83,3 @@ radio:
build: dss.radio/
ports:
- "8888:8888"
environment:
- ICE_PASSWORD={$ICE_PASSWORD}