Remove merge conflict metadata from UCP docs

Joao Fernandes · Joao Fernandes · commit f1102790e2bd · 2016-11-02T11:41:48.000-07:00
diff --git a/ucp/images/license.png b/ucp/images/license.png
diff --git a/ucp/install-sandbox.md b/ucp/install-sandbox.md
@@ -54,7 +54,6 @@ the correct ones for you environment.
 >**Note**: The command examples in this page were tested for a macOS environment.
 If you are in another, you may need to adjust to use analogous commands for your environment.
 
-
 ## Step 2. Verify the prerequisites
 
 This example requires that you have:
diff --git a/ucp/reference/regen-certs.md b/ucp/reference/regen-certs.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ---
 description: Regenerate certificates for Docker Universal Control Plane.
 keywords:
@@ -9,16 +8,6 @@ menu:
     parent: ucp_ref
 title: regen-certs.md
 ---
-=======
-+++
-title = "regen-certs.md"
-description = "Regenerate certificates for Docker Universal Control Plane."
-keywords= ["install, ucp"]
-[menu.main]
-parent = "ucp_ref"
-identifier = "ucp_ref_regen_certs"
-+++
->>>>>>> e53bc30bf9a66117a7903d5926b6ab4280aba40d
 
 # docker/ucp regen-certs
 
