Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove git conflict markers 

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

1
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`