From 4b0ab60da2779c2d9738650194cce3b2b6fb8c82 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Wed, 11 Mar 2020 00:24:21 +0800
Subject: [PATCH] target/generic: fix kernel419 config

---
 target/linux/generic/config-4.19 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index 282c384411..2315220ab3 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -6120,8 +6120,5 @@ CONFIG_ZONE_DMA=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZSMALLOC is not set
 # CONFIG_ZX_TDM is not set
-<<<<<<< HEAD
-=======
 # CONFIG_NET_ACT_CTINFO is not set
 # CONFIG_RPI_AXIPERF is not set
->>>>>>> 252c766ae3fcf52e1610d534056f17d556ec3c99