summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--models/project.ini13
1 files changed, 0 insertions, 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