From 072f3dfb03a203ac546acf631f5bdb484d1213c0 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Tue, 15 Aug 2017 10:25:14 -0700 Subject: [PATCH] removed commented out code, removed blocks from default scripts --- libraries/script-engine/src/FileScriptingInterface.cpp | 1 - scripts/defaultScripts.js | 1 - 2 files changed, 2 deletions(-) diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 681156973b..68a141ad97 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -53,7 +53,6 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool } QStringList fileList = unzipFile(path, tempDir); - //QString filename = QUrl::fromLocalFile(fileList.first()).toString(); if (!fileList.isEmpty()) { qCDebug(scriptengine) << "File to upload: " + fileList.first(); diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index bddb2ae703..2270118861 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -24,7 +24,6 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/makeUserConnection.js", "system/tablet-goto.js", "system/marketplaces/marketplaces.js", - "system/marketplaces/blocksApp.js", // temporarily in default scripts for testing purposes "system/edit.js", "system/notifications.js", "system/dialTone.js",