diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2018-06-12 11:44:01 +0200 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2018-06-12 11:44:01 +0200 |
| commit | 9be14c014ff1ce4fc5fee4538837f78c62cffa56 (patch) | |
| tree | 266a1650b45e9330211dffb18134dcb74b9ed16b | |
| parent | 7f4d183f176722d62730dbb29380e70a145c18d7 (diff) | |
| download | rockbox-9be14c014ff1ce4fc5fee4538837f78c62cffa56.zip rockbox-9be14c014ff1ce4fc5fee4538837f78c62cffa56.tar.gz rockbox-9be14c014ff1ce4fc5fee4538837f78c62cffa56.tar.bz2 rockbox-9be14c014ff1ce4fc5fee4538837f78c62cffa56.tar.xz | |
Fix merge error
Change-Id: If1b5258bb86e477ac4cb1adb95f6c887a2ef8810
| -rw-r--r-- | firmware/target/hosted/alsa-controls.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h index a08fc46..0505ee3 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 * |