tosquash: resolve conflicts

devitocodes · May 5, 2021 · 41fae93 · 41fae93
1 parent 4a43c8f
commit 41fae93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/devito/passes/iet/misc.py b/devito/passes/iet/misc.py
@@ -6,7 +6,7 @@
 from devito.logger import warning
 from devito.passes.iet.engine import iet_pass
 from devito.symbolics import INT
-from devito.tools import split
+from devito.tools import split, is_integer
 
 __all__ = ['avoid_denormals', 'hoist_prodders', 'relax_incr_dimensions', 'is_on_device']