fix merge error

Origin commit data
------------------
Branch: ni/coolstream
Commit: 95d09d638b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- fix 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-09-14 16:47:43 +02:00
parent f3ccea3915
commit 4f14db498f

View File

@@ -60,6 +60,7 @@ CUpdateSettings::~CUpdateSettings()
#endif
}
#if ENABLE_EXTUPDATE
#define SOFTUPDATE_NAME_MODE1_OPTION_COUNT 3
const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE1_OPTIONS[SOFTUPDATE_NAME_MODE1_OPTION_COUNT] =
{