Cleanup after merge

2015-02-06 15:02:38 +01:00
parent 88274cff6e
commit a41bc4ce18
2 changed files with 0 additions and 11 deletions
--- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
@@ -140,12 +140,7 @@ namespace Opm {
                handleWRFTPLT(keyword, logger, timestep);
            }
        }
-
-<<<<<<< HEAD
-
-=======
        checkUnhandledKeywords(deck);
->>>>>>> upstream/master
    }

    void Schedule::handleDATES(DeckKeywordConstPtr keyword, LoggerPtr /*logger*/) {
--- a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp
@@ -49,13 +49,7 @@ namespace Opm {
          m_headI(headI),
          m_headJ(headJ),
          m_refDepth(refDepth),
-<<<<<<< HEAD
-
          m_preferredPhase(preferredPhase),
-
-=======
-          m_preferredPhase(preferredPhase),
->>>>>>> upstream/master
          m_grid( grid )
    {
        m_name = name_;