Corrected bad rebase

2023-01-21 14:27:45 +00:00
parent 80035cadae
commit f37f8f301a
13 changed files with 37 additions and 67 deletions
--- a/src/Insight/Insight.cpp
+++ b/src/Insight/Insight.cpp
@@ -39,11 +39,7 @@ namespace Bloom
            (
                QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true),
 #ifndef BLOOM_DEBUG_BUILD
-<<<<<<< HEAD
-                QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/../plugins")),
-=======
                QCoreApplication::addLibraryPath(QString::fromStdString(Services::PathService::applicationDirPath() + "/plugins")),
->>>>>>> 0fea8bc1 (Moved Paths helper functions to service class)
 #endif
                QApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
            )