From cfd105cd5bb5250cf3bab9d90c4644ce8a1bfab7 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date: Fri, 5 Aug 2016 10:48:19 +0200
Subject: [PATCH] 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>
---
 docs/reference/commandline/swarm_join.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/reference/commandline/swarm_join.md b/docs/reference/commandline/swarm_join.md
index d207c2c9f3..a9528ab884 100644
--- a/docs/reference/commandline/swarm_join.md
+++ b/docs/reference/commandline/swarm_join.md
@@ -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`