fix megre portaudio error

2022-05-13 20:39:52 -07:00 · 2022-05-13 20:39:52 -07:00 · 3ea84c825a
parent 36c4f92396
commit 3ea84c825a
1 changed files with 0 additions and 1 deletions
--- a/meta/meta-mediatek-aud/recipes-apps/portaudio/portaudio_19.0.7.bb
+++ b/meta/meta-mediatek-aud/recipes-apps/portaudio/portaudio_19.0.7.bb
@ -21,7 +21,6 @@ do_install() {
    install -m 755 ${S}/include/portaudio.h ${D}${includedir}/
 }

-<<<<<<< HEAD
 # The base package, this includes everything needed to actually run the application on the target system.
 PACKAGES += "FILES-${PN}-lib"