rebase fixup

This commit is contained in:
Joakim Hove
2020-10-07 18:30:38 +02:00
parent 00d5421153
commit 956dce6be6
@@ -228,7 +228,6 @@ namespace {
}
}
>>>>>>> Updates to well control mode reported in IWEL
template <typename IWellArray>
void setCurrentControl(const Opm::Well& well,