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 9c45347e authored by Hiro's avatar Hiro 🏄

Fix merge conflicts again

parent d62d51ac
......@@ -10,13 +10,8 @@ type = string
label = Link
type = url
<<<<<<< HEAD
[fields.maintained]
label = Maintained
=======
[fields.active]
label = Active
>>>>>>> anto/master
type = boolean
[fields.subtitle]
......@@ -31,26 +26,18 @@ type = string
label = body
type = markdown
<<<<<<< HEAD
[fields.maintainers]
label = Maintainers
=======
[fields.mentors]
label = Mentors
>>>>>>> anto/master
type = strings
[fields.languages]
label = Languages
type = strings
<<<<<<< HEAD
=======
[fields.difficulty]
label = Difficulty Level
type = string
>>>>>>> anto/master
[fields.html]
label = Html
type = string
......
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