Files fixed after merge conflicts

ApplicationCode/Application/RiaPreferences.cpp

@@ -59,7 +59,10 @@ RiaPreferences::RiaPreferences(void)
     CAF_PDM_InitField(&autocomputeSOIL,                 "autocomputeSOIL", true, "SOIL", "", "SOIL = 1.0 - SGAS - SWAT", "");
     CAF_PDM_InitField(&autocomputeDepthRelatedProperties,"autocomputeDepth", true, "DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", "");
 
+<<<<<<< HEAD
     CAF_PDM_InitField(&readFaultData,                   "readFaultData", true, "Read fault data", "", "", "");
+=======
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
     CAF_PDM_InitField(&useStreamTransfer,                "useStreamTransfer", true, "Use stream transfer to Octave", "", "", "");
     CAF_PDM_InitField(&blockSize,                       "blockSize", 10000, "blockSize", "", "", "");
 }

ApplicationCode/Application/RiaPreferences.h

@@ -63,6 +63,9 @@ public: // Pdm Fields
     caf::PdmField<bool>     useStreamTransfer;
     caf::PdmField<int>      blockSize;
 
+    caf::PdmField<bool>     useStreamTransfer;
+    caf::PdmField<int>      blockSize;
+
 protected:
     virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
 

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

ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp

@@ -253,8 +253,11 @@ void RigReservoirBuilderMock::populateReservoir(RigCaseData* eclipseCase)
     {
         addWellData(eclipseCase, eclipseCase->mainGrid());
     }
+<<<<<<< HEAD
 
     addFaults(eclipseCase);
+=======
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 
     // Set all cells active
     RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo(RifReaderInterface::MATRIX_RESULTS);
@@ -492,6 +495,7 @@ void RigReservoirBuilderMock::addWellData(RigCaseData* eclipseCase, RigGridBase*
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
+<<<<<<< HEAD
 void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase)
 {
     if (!eclipseCase) return;
@@ -529,6 +533,8 @@ void RigReservoirBuilderMock::addFaults(RigCaseData* eclipseCase)
     grid->setFaults(faults);
 }
 
+=======
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 void RigReservoirBuilderMock::enableWellData(bool enableWellData)
 {
     m_enableWellData = false;

Fwk/AppFwk/cafUserInterface/CMakeLists.txt

@@ -38,8 +38,13 @@ endif()
 
 
 add_library( ${PROJECT_NAME}
+<<<<<<< HEAD
 	cafAboutDialog.cpp
 	cafAboutDialog.h
+=======
+	cafBasicAboutDialog.cpp
+	cafBasicAboutDialog.h
+>>>>>>> 770f70680345d00c4b6c828e1e36f3f12000a390
 	cafPdmSettings.cpp
 	cafPdmUiCheckBoxEditor.cpp
 	cafPdmUiCheckBoxEditor.h