Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker · cfd105cd5b - git.nibbletools.com by Gogs

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)

Signed-off-by: Tibor Vass <tibor@docker.com>

Sebastiaan van Stijn 9 years ago

parent

4b9b07f281

commit

cfd105cd5b

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
docs/reference/commandline/swarm_join.md
							 
								View File
							
				@@ -90,7 +90,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`