Cleanup unresolved merge

plone · Dec 29, 2013 · 8b9a197 · 8b9a197 · mister-roboto · Dec 29, 2013
1 parent 58e55ad
commit 8b9a197
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/plone/schemaeditor/fields.py b/plone/schemaeditor/fields.py
@@ -51,14 +51,9 @@ def FieldsVocabularyFactory(context):
     field_factories = getUtilitiesFor(IFieldFactory)
     terms = []
     for (field_id, factory) in field_factories:
-<<<<<<< HEAD
-        if factory.available():
-            terms.append(SimpleVocabulary.createTerm(factory, translate(factory.title), factory.title))
-=======
         terms.append(SimpleVocabulary.createTerm(factory,
                                                  translate(factory.title),
                                                  factory.title))
->>>>>>> 5a2968a3a4091ad90ba3badc378f3d37b14dc2bc
 
     return SimpleVocabulary(terms)