fix missing merge confict

Miguel Barão
1 parent cc91e4c0
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
perguntations/testfactory.py
@@ -107,11 +107,7 @@ class TestFactory(dict):
         normalize_question_list(self["questions"])
  
         # --- for review, we are done. no factories needed
-<<<<<<< HEAD
         # if self['review']:  FIXME: make it work!
-=======
-        # if self['review']:  FIXME:
->>>>>>> dev
         #     logger.info('Review mode. No questions loaded. No factories.')
         #     return
...	...	@@ -107,11 +107,7 @@ class TestFactory(dict):
107	107	normalize_question_list(self["questions"])
108	108
109	109	# --- for review, we are done. no factories needed
110		-<<<<<<< HEAD
111	110	# if self['review']: FIXME: make it work!
112		-=======
113		- # if self['review']: FIXME:
114		->>>>>>> dev
115	111	# logger.info('Review mode. No questions loaded. No factories.')
116	112	# return
117	113
...	...