##// END OF EJS Templates
Fix merge problem
trabillard -
r1297:3731b9185cc1
parent child
Show More
@@ -297,14 +297,9 CatalogueController::eventsForMimeData(const QByteArray &mimeData) const
297
297
298 void CatalogueController::initialize()
298 void CatalogueController::initialize()
299 {
299 {
300 <<<<<<< HEAD
301 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")
302 << QThread::currentThread();
303 impl->m_WorkingMutex.lock();
304 =======
305 qCDebug(LOG_CatalogueController())
300 qCDebug(LOG_CatalogueController())
306 << tr("CatalogueController init") << QThread::currentThread();
301 << tr("CatalogueController init") << QThread::currentThread();
307 >>>>>>> 286decc... unthread the catalogue controller
302
308 impl->m_CatalogueDao.initialize();
303 impl->m_CatalogueDao.initialize();
309 auto defaultRepositoryLocation
304 auto defaultRepositoryLocation
310 = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
305 = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
General Comments 3
Under Review
author

Auto status change to "Under Review"

Approved
author

Status change > Approved

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