From e5802dc0f304c0368cce5a2e4f47351a837790ea Mon Sep 17 00:00:00 2001
From: xuyanghang <xyh1120131893@163.com>
Date: Tue, 9 Jan 2024 17:59:12 +0800
Subject: [PATCH] merge upstream

---
 APP_Framework/Framework/connection/4g/ec200a/Kconfig | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/APP_Framework/Framework/connection/4g/ec200a/Kconfig b/APP_Framework/Framework/connection/4g/ec200a/Kconfig
index 4f36d58c0..fd7ca98a9 100644
--- a/APP_Framework/Framework/connection/4g/ec200a/Kconfig
+++ b/APP_Framework/Framework/connection/4g/ec200a/Kconfig
@@ -3,7 +3,6 @@ config ADAPTER_4G_EC200A
         default "ec200a"
 
 if ADD_XIZI_FEATURES
-<<<<<<< HEAD
         config ADAPTER_EC200A_USING_PWRKEY
                 bool "EC200A using PWRKEY pin number"
                 default n
@@ -103,10 +102,3 @@ if ADD_RTTHREAD_FEATURES
 
 
 endif
-=======
-        config ADAPTER_EC200A_DRIVER
-                string "EC200A device uart driver path"
-                default "/dev/usart6_dev6"
-endif
-
->>>>>>> upstream/prepare_for_master