Rebase mistake

equinor · Sep 30, 2024 · f402b5e · f402b5e
1 parent 906a9b9
commit f402b5e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/ert/config/ensemble_config.py b/src/ert/config/ensemble_config.py
@@ -15,12 +15,7 @@
 
 from ert.field_utils import get_shape
 
-<<<<<<< HEAD
-from .field import Field
-=======
-from ._read_summary import read_summary
 from .field import Field as FieldConfig
->>>>>>> 9beba276b (Updates)
 from .gen_data_config import GenDataConfig
 from .gen_kw_config import GenKwConfig
 from .parameter_config import ParameterConfig