[tor-commits] [community/staging] Fix issues with merge

[pili at torproject.org]

commit 5a78ce21bf6703ca3e07c6de229e555a976661d6
Author: Pili Guerra <pili at piliguerra.com>
Date:   Thu Jun 6 12:06:59 2019 +0200

    Fix issues with merge
---
 content/onion-services/setup/contents.lr | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr
index 54dd91d..08be1b7 100644
--- a/content/onion-services/setup/contents.lr
+++ b/content/onion-services/setup/contents.lr
@@ -16,11 +16,6 @@ key: 1
 ---
 cta: Get Started
 ---
-<<<<<<< HEAD
-cta: Get Started
----
-=======
->>>>>>> 456701b... Onion services
 html: onion-services.html
 ---
 body: