Commit 3783c20c authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fix merge conflicts.

parent edc8030e

isis/src/qisis/apps/ipce/IpceMainWindow.cpp

+2 −1
Original line number Diff line number Diff line
@@ -802,7 +802,8 @@ namespace Isis { 
      m_maxThreadCount = globalSettings.value("maxThreadCount", m_maxThreadCount).toInt();

      applyMaxThreadCount();

    }

  //  m_directory->project()->setClean(true);



    m_directory->project()->setClean(true);

  }