commit 2680fbaf327de82adec7e106baeae0d50e8710ed Author: Pili Guerra pili@torproject.org Date: Thu May 30 13:53:53 2019 +0000

Onion services --- content/onion-services/setup/contents.lr | 3 +++ 1 file changed, 3 insertions(+)

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