1. docker
  2. Commit 3c55fb8c066859416ec3e562fcd17a1b878c9315
Browse code

Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker

Remove git conflict markers in docs/reference/commandline/swarm_join.md
(cherry picked from commit 49819165460f12606cb96fc0e579cb4019e407da)

Sebastiaan van Stijn authored on 2016/08/05 17:48:19
Showing 1 changed files
docs/reference/commandline/swarm_join.md
History View file @ 3c55fb8
... ... 
@@ -90,7 +90,6 @@ This flag is generally not necessary when joining an existing swarm.
90 90 
 ### `--manager`
91 91
92 92 
 Joins the node as a manager
93 
->>>>>>> 22565e1... Split advertised address from listen address
94 93
95 94 
 ### `--token string`
96 95