mirror of
https://github.com/clearlinux/docker.git
synced 2026-11-20 13:03:59 +00:00
resolved merge conflict
Signed-off-by: Daniel Menet <membership@sontags.ch>
This commit is contained in:
Signed-off-by: Daniel Menet <membership@sontags.ch>