Fix logical conflict not picked up by merge algorithm

LLNL · Dec 5, 2024 · f80fab5 · f80fab5
1 parent 2c58613
commit f80fab5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/serac/numerics/functional/domain.cpp b/src/serac/numerics/functional/domain.cpp
@@ -584,7 +584,7 @@ Domain set_operation(SET_OPERATION op, const Domain& a, const Domain& b)
   assert(a.dim_ == b.dim_);
   assert(a.type_ == b.type_);
 
-  Domain output{a.mesh_, a.dim_, a.type_};
+  Domain combined{a.mesh_, a.dim_, a.type_};
 
   using Ids         = std::vector<int>;
   auto apply_set_op = [&op](const Ids& x, const Ids& y) { return set_operation(op, x, y); };