fix merge-error

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1da05b3cee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 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-08-01 12:37:12 +02:00
parent 0c4b28ddfe
commit 22ee4f9999

View File

@@ -2427,7 +2427,6 @@ TIMER_START();
InitZapitClient();
g_Zapit->setStandby(false);
g_info.hw_caps = get_hwcaps();
CheckFastScan();