mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
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:
@@ -2427,7 +2427,6 @@ TIMER_START();
|
|||||||
|
|
||||||
InitZapitClient();
|
InitZapitClient();
|
||||||
g_Zapit->setStandby(false);
|
g_Zapit->setStandby(false);
|
||||||
g_info.hw_caps = get_hwcaps();
|
|
||||||
|
|
||||||
CheckFastScan();
|
CheckFastScan();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user