Solving merge conflict
Merge branch 'master' of github.com:Ensembles/ert
Merge branch 'master' of github.com:Ensembles/ert
Merge branch 'master' of github.com:Ensembles/ert
Merge branch 'master' of github.com:Ensembles/ert
Removed the word workflow from the panels in the ert_gui.
Added check of refcase when results from eclipse simulations are loaded
Check refcase: changed to different name for config files so that true/false instances of the enkf_state_report_step_compatible test writes to different log files and can be run in parallell with -j option
Fix: Unintended change of method name
Removed method declaration
Merge branch 'master' of github.com:Ensembles/ert
Merge branch 'master' into check_refcase
Fixed merge error
Fixed merge error
Fixed merge error
ERT-171 Moved the iterations from the tui to enkf_main for the iterative smoother.
Merge branch 'master' of github.com:Ensembles/ert
Merge branch 'master' into check_refcase
Added state_map implementation
Added enum realisation_state_enum