From 5b9607ca29baa2dedd6cf636bc314dfb85778ca5 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 12 Jan 2016 10:36:59 -0800 Subject: [PATCH] fix merge --- interface/src/Application.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2af7f02972..087c6503d0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -448,8 +448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : _bookmarks = new Bookmarks(); // Before setting up the menu - _runningScriptsWidget = new RunningScriptsWidget(_window); - // start the nodeThread so its event loop is running QThread* nodeThread = new QThread(this); nodeThread->setObjectName("NodeList Thread");