From 07f11585aa3dc7782fb91bbd132363567eb0b0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Sun, 14 Nov 2021 13:52:35 +0100 Subject: [PATCH] Fix rebase error. --- src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 3ce5aef38..570356dc1 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -1292,7 +1292,6 @@ void Schedule::iterateScheduleSection(std::size_t load_start, std::size_t load_e parseContext, errors, grid, - /*FieldPropsManager *fp=*/nullptr, matching_wells, /*actionx_mode=*/false, &sim_update, @@ -1307,7 +1306,6 @@ void Schedule::iterateScheduleSection(std::size_t load_start, std::size_t load_e errors, grid, &target_wellpi, - /*FieldPropsManager *fp=*/nullptr, prefix); } }