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

Fix after merge conflicts take two

Browse Source
This commit is contained in:
Magne Sjaastad
2014-04-14 10:24:15 +02:00
parent ce33c00219
commit 7b68c3cb6b
7 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimDefines.h
View File

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