#1672: fix merge conflicts

DARMA-tasking · May 30, 2022 · 49a0012 · 49a0012
1 parent a4a6b23
commit 49a0012
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/vt/vrt/collection/balance/model/raw_data.cc b/src/vt/vrt/collection/balance/model/raw_data.cc
@@ -95,7 +95,6 @@ int RawData::getNumSubphases() {
 }
 
 TimeType RawData::getModeledLoad(ElementIDStruct object, PhaseOffset offset) {
-{
   return getRawLoad(object, offset);
 }