Patrick Böänziger 5099c5cfca Remove git conflict markers ...

Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com>
Upstream-commit: 8b51443ea1
Component: cli

2017-06-02 00:10:04 +00:00

..

contrib/completion

Add zsh completion for 'docker node rm --force'

2017-06-02 00:10:04 +00:00

docs

Remove git conflict markers

2017-06-02 00:10:04 +00:00

experimental

Add a bundlefile example in the documentation

2017-06-02 00:10:03 +00:00

man

Fix the man/Dockerfile for arm

2017-06-02 00:10:04 +00:00