GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1297:3731b9185cc1

Fix merge problem

trabillard -

r1297:3731b9185cc1

parent child

Context file:

r1297:3731b9185cc1

core/src/Catalogue/CatalogueController.cpp +1 -6

              void CatalogueController::initialize()
              {
-             <<<<<<< HEAD
-                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")
-                                                    << QThread::currentThread();
-                 impl->m_WorkingMutex.lock();
-             =======
                  qCDebug(LOG_CatalogueController())
                      << tr("CatalogueController init") << QThread::currentThread();
-             >>>>>>> 286decc... unthread the catalogue controller
                  impl->m_CatalogueDao.initialize();
                  auto defaultRepositoryLocation
                      = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages