OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Files fixed after merge conflicts

Browse Source
This commit is contained in:
Magne Sjaastad
2014-04-14 09:25:27 +02:00
parent 0562f92585 770f706803
commit ce33c00219
7 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@@ -49,7 +49,10 @@
#include "Rim3dOverlayInfoConfig.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
<<<<<<< HEAD
#include "RiaPreferences.h"
=======
>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
#include "RimMockModelSettings.h"
CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");