neutrino.cpp: fix small merge error

Origin commit data
------------------
Branch: ni/coolstream
Commit: be611303cf
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2017-12-20 15:24:07 +01:00
parent bf4c5aa93c
commit 2f5f308dab

View File

@@ -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);