From e04aa4b3cc6e7829a187f7fc40ec6265a6809ddb Mon Sep 17 00:00:00 2001 From: Kilrah Date: Mon, 24 Jul 2017 11:51:26 +0200 Subject: [PATCH] Revert "Add sam-ba location to list of settings that must not be imported" This reverts commit 1bb6a82cf3093031b5f8ce702b652ff354a0d196. --- companion/src/storage/appdata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp index 1893253b1..3a16b0e11 100644 --- a/companion/src/storage/appdata.cpp +++ b/companion/src/storage/appdata.cpp @@ -705,7 +705,7 @@ bool AppData::importSettings(QSettings & toSettings) QStringList excludeKeys = QStringList() << "compilation-server"; #ifdef WIN32 // locations of tools which come with Companion distros - excludeKeys << "avrdude_location" << "avrdudeLocation" << "dfu_location" << "samba_location" << "sambaLocation"; + excludeKeys << "avrdude_location" << "avrdudeLocation" << "dfu_location"; // install-specific keys; "." is the "default" key which may contain install path excludeKeys << "Start Menu Folder" << "."; #endif