typo

2014-01-25 18:38:51 +01:00
parent 880b6366eb
commit d3f42efe85
2 changed files with 7 additions and 1 deletions
--- a/tiramisu/setting.py
+++ b/tiramisu/setting.py
@ -594,7 +594,6 @@ class Settings(object):

        # filters the callbacks
        calc_properties = set()
-<<<<<<< HEAD
        context = self._getcontext()
        for require in opt.impl_getrequires():
            expected = tuple(require.get_expected())