From dbc81968f9bd66b6742a1f7d67a8ef7d1b94177c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Nov 2017 08:45:06 +0100 Subject: [PATCH] fix another merge error Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/59a9cc5dff4a0c2e0eadfb7fb8626df549a52909 Author: vanhofen Date: 2017-11-03 (Fri, 03 Nov 2017) Origin message was: ------------------ - fix another merge error --- src/gui/audio_select.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index e9960fb03..08a750648 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -184,11 +184,7 @@ int CAudioSelectMenuHandler::doMenu () } perc_str[i] = to_string(perc_val[i]) + "%"; -<<<<<<< HEAD - CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc, -======= CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc, ->>>>>>> ni/tuxbox true, perc_str[i], this, "s", CRCInput::convertDigitToKey(i + 1)); fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); fw->setMarked(sel_apid == i);