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 /firmware/target | |
| parent | 7f4d183f176722d62730dbb29380e70a145c18d7 (diff) | |
| download | rockbox-9be14c014ff1ce4fc5fee4538837f78c62cffa56.tar.gz rockbox-9be14c014ff1ce4fc5fee4538837f78c62cffa56.zip | |
Fix merge error
Change-Id: If1b5258bb86e477ac4cb1adb95f6c887a2ef8810
Diffstat (limited to 'firmware/target')
| -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 a08fc46e14..0505ee3dd1 100644 --- a/firmware/target/hosted/alsa-controls.h +++ b/firmware/target/hosted/alsa-controls.h | |||
| @@ -1,19 +1,10 @@ | |||
| 1 | /*************************************************************************** | 1 | /*************************************************************************** |
| 2 | <<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c | ||
| 3 | * __________ __ ___. | ||
| 4 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
| 5 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
| 6 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
| 7 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
| 8 | * \/ \/ \/ \/ \/ | ||
| 9 | ======= | ||
| 10 | * __________ __ ___. | 2 | * __________ __ ___. |
| 11 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
| 12 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
| 13 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
| 14 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
| 15 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
| 16 | >>>>>>> Agptek rocker port initial commit | ||
| 17 | * | 8 | * |
| 18 | * Copyright (C) 2016 Amaury Pouly | 9 | * Copyright (C) 2016 Amaury Pouly |
| 19 | * | 10 | * |