From 22ee4f99999fad52e4f4d086c26df9dd25a1771d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 1 Aug 2017 12:37:12 +0200 Subject: [PATCH] fix merge-error Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1da05b3cee51a6d1633c8e6644a406e782d3eb8e Author: vanhofen 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 --- src/neutrino.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7f4c46846..b73d2eaf4 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2427,7 +2427,6 @@ TIMER_START(); InitZapitClient(); g_Zapit->setStandby(false); - g_info.hw_caps = get_hwcaps(); CheckFastScan();