GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit d62d51ac authored by Hiro's avatar Hiro 🏄
Browse files

Fix merge conflict

parent a521daa0
<<<<<<< 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment