kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove git conflict markers

Browse source 
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 Patrick Bänziger
parent 9513aa3a48
commit 34278b3301
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`