From cff8043267b839645bde4eb12e3bfebb2f4c8c3a 2017-12-20 09:40:25
From: Thibaud Rabillard <trabillard@itlink.fr>
Date: 2017-12-20 09:40:25
Subject: [PATCH] Fix merge problem

---

diff --git a/core/src/Catalogue/CatalogueController.cpp b/core/src/Catalogue/CatalogueController.cpp
index fccf228..67f8b90 100644
--- a/core/src/Catalogue/CatalogueController.cpp
+++ b/core/src/Catalogue/CatalogueController.cpp
@@ -297,14 +297,9 @@ CatalogueController::eventsForMimeData(const QByteArray &mimeData) const
 
 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);