From 3ea84c825ac5dcf8d2e4cc3a622ecd6d83db2c50 Mon Sep 17 00:00:00 2001
From: Huang Xin <xajhuang@163.com>
Date: Fri, 13 May 2022 20:39:52 -0700
Subject: [PATCH] fix megre portaudio error

---
 .../meta-mediatek-aud/recipes-apps/portaudio/portaudio_19.0.7.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git 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
index 5a6713680..29e5ab11f 100644
--- 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"