From 38ceaa662d155b1d549b63023c6f35b523d891a0 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sat, 16 Jan 2021 23:26:33 +0800
Subject: [PATCH] mbedtls: remove git conflict mark

Fixes: b65bd6d007 ("Merge Official Source")

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
---
 package/libs/mbedtls/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index d6c9bd1007..367d88c10a 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -21,7 +21,6 @@ PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=gpl-2.0.txt
 PKG_CPE_ID:=cpe:/a:arm:mbed_tls
 
-<<<<<<< HEAD
 PKG_CONFIG_DEPENDS:=CONFIG_LIBMBEDTLS_DEBUG_C CONFIG_LIBMBEDTLS_HAVE_SSE2
 PKG_CONFIG_DEPENDS := \
 	CONFIG_LIBMBEDTLS_DEBUG_C \