fix merge failure 07/45907/1
[sdc/sdc-docker-base.git] / base_sdc-vnc /
drwxr-xr-x   ..
-rw-r--r-- 263 Dockerfile