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