p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove git conflict markers

Browse Source 
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com>
Upstream-commit: 8b51443ea1
Component: cli
This commit is contained in:
Patrick Böänziger
2016-08-05 09:19:16 +02:00
committed by Tibor Vass
parent 9afa83e8be
commit 5099c5cfca
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/cli/docs/reference/commandline/swarm_join.md
View File

@ -88,7 +88,6 @@ This flag is generally not necessary when joining an existing swarm.
### `--manager`
Joins the node as a manager
>>>>>>> 22565e1... Split advertised address from listen address
### `--token string`