From 9be14c014ff1ce4fc5fee4538837f78c62cffa56 Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Tue, 12 Jun 2018 11:44:01 +0200 Subject: Fix merge error Change-Id: If1b5258bb86e477ac4cb1adb95f6c887a2ef8810 --- firmware/target/hosted/alsa-controls.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'firmware/target/hosted/alsa-controls.h') diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h index a08fc46e14..0505ee3dd1 100644 --- a/firmware/target/hosted/alsa-controls.h +++ b/firmware/target/hosted/alsa-controls.h @@ -1,19 +1,10 @@ /*************************************************************************** -<<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ -======= * __________ __ ___. * Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ ->>>>>>> Agptek rocker port initial commit * * Copyright (C) 2016 Amaury Pouly * -- cgit v1.2.3