From 2f5f308dabd5733eaa87e9bd383e499255e097d6 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 20 Dec 2017 15:24:07 +0100 Subject: [PATCH] neutrino.cpp: fix small merge error Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/be611303cfdffd967c4db33fb8cfe2b108688280 Author: vanhofen Date: 2017-12-20 (Wed, 20 Dec 2017) Origin message was: ------------------ - neutrino.cpp: fix small merge error ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2758ce2fd..253792cf2 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -897,8 +897,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.backup_dir = configfile.getString("backup_dir", "/media"); - g_settings.backup_dir = configfile.getString("backup_dir", "/media"); - g_settings.update_dir = configfile.getString("update_dir", "/tmp"); g_settings.update_dir_opkg = configfile.getString("update_dir_opkg", g_settings.update_dir);