From 34278b3301c0ca339d32a90264f0018e35a1e7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20B=C3=B6=C3=A4nziger?=
 <patrick.baenziger@bsi-software.com>
Date: Fri, 5 Aug 2016 09:19:16 +0200
Subject: [PATCH] Remove git conflict markers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.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 1d1d782d2e..9a13430b46 100644
--- a/docs/reference/commandline/swarm_join.md
+++ b/docs/reference/commandline/swarm_join.md
@@ -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`