Files fixed after merge conflicts

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -44,8 +44,11 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.h
 ${CEE_CURRENT_LIST_DIR}RimMimeData.h
 ${CEE_CURRENT_LIST_DIR}RimCommandObject.h
 ${CEE_CURRENT_LIST_DIR}RimTools.h
+<<<<<<< HEAD
 ${CEE_CURRENT_LIST_DIR}RimFault.h
 ${CEE_CURRENT_LIST_DIR}RimFaultCollection.h
+=======
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h
 )
 
@@ -89,8 +92,11 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.cpp
 ${CEE_CURRENT_LIST_DIR}RimMimeData.cpp
 ${CEE_CURRENT_LIST_DIR}RimCommandObject.cpp
 ${CEE_CURRENT_LIST_DIR}RimTools.cpp
+<<<<<<< HEAD
 ${CEE_CURRENT_LIST_DIR}RimFault.cpp
 ${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp
+=======
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 ${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp
 )
 

ApplicationCode/ProjectDataModel/RimDefines.h

@@ -40,8 +40,11 @@ public:
     };
 
     static QString undefinedResultName() { return "None"; }
+<<<<<<< HEAD
     static QString undefinedGridFaultName() { return "Undefined grid faults"; }
     static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; }
+=======
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 
 
     // Mock model text identifiers
@@ -51,5 +54,9 @@ public:
     static QString mockModelCustomized()            { return "Result Mock Debug Model Customized"; }
     static QString mockModelBasicInputCase()        { return "Input Mock Debug Model Simple"; }
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 };
 

ApplicationCode/ProjectDataModel/RimResultCase.cpp

@@ -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");