Remove git conflict markers

Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com> Upstream-commit: 34278b3301c0ca339d32a90264f0018e35a1e7e9 Component: engine
2016-08-05 09:41:45 +02:00
parent 75a7c851a1
commit 7c2f803204
1 changed files with 0 additions and 1 deletions
@@ -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`