[tor-commits] [dev/staging] Fix merge conflicts again

[hiro@xxxxxxxxxxxxxx]

commit 9c45347efc6dd76d7674d3dbe4ec280d387a2224
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Wed Nov 25 15:46:41 2020 +0100

    Fix merge conflicts again
---
 models/project.ini | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/models/project.ini b/models/project.ini
index d9bd3f1..6d5f780 100644
--- a/models/project.ini
+++ b/models/project.ini
@@ -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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits