commit d62d51ac215756aba11df215febec5114f81b23d Author: hiro <hiro@torproject.org> Date: Wed Nov 25 15:44:16 2020 +0100 Fix merge conflict --- content/tor-ecosystem/contents.lr | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/content/tor-ecosystem/contents.lr b/content/tor-ecosystem/contents.lr index e7e6f17..eb5b9d1 100644 --- a/content/tor-ecosystem/contents.lr +++ b/content/tor-ecosystem/contents.lr @@ -1,26 +1,9 @@ -<<<<<<< HEAD -section: tor-ecosystem -======= section: tor ecosystem ->>>>>>> anto/master --- section_id: tor-ecosystem --- color: primary --- -<<<<<<< HEAD -_template: layout.html ---- -title: Tor Ecosystem ---- -subtitle: Here are some other organisations and teams that form part of the wider Tor Ecosystem ---- -key: 6 ---- -html: training.html ---- -body: -======= key: 6 --- html: section.html @@ -34,4 +17,3 @@ subtitle: Applications that use tor: Ones we maintain, like Tor Browser, and sel body: the overview ->>>>>>> anto/master