misc: Tidy up rebase

devitocodes · Feb 2, 2024 · 2cd952e · 2cd952e
1 parent 8b3920d
commit 2cd952e
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/devito/types/dense.py b/devito/types/dense.py
@@ -856,16 +856,8 @@ def _arg_check(self, args, intervals, **kwargs):
             warning("Data type %s of runtime value `%s` does not match the "
                     "Function data type %s" % (data.dtype, self.name, self.dtype))
 
-<<<<<<< HEAD
         # Check each Dimension for potential OOB accesses
         for i, s in zip(self.dimensions, data.shape):
-=======
-        for i, s in zip(self.dimensions, key.shape):
-<<<<<<< HEAD
-            # NOTE: This must be where the arg check occurs
->>>>>>> 4ede6a6fd (dsl: Fix halo size on empty ranks with MPI)
-=======
->>>>>>> 9ee5d294a (dsl: Fix Function on SubDomain size)
             i._arg_check(args, s, intervals[i])
 
         if args.options['index-mode'] == 'int32' and \