Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge error

Browse source 
Change-Id: If1b5258bb86e477ac4cb1adb95f6c887a2ef8810
This commit is contained in:
Marcin Bukat 2018-06-12 11:44:01 +02:00
parent 7f4d183f17
commit 9be14c014f
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
firmware/target/hosted/alsa-controls.h
View file

@ -1,19 +1,10 @@
/***************************************************************************
<<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
=======
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
>>>>>>> Agptek rocker port initial commit
*
* Copyright (C) 2016 Amaury Pouly
*