From 2437a8a019e5c3eb047690c221883764635efffb Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sat, 30 Dec 2023 12:01:55 +0800
Subject: [PATCH] mediatek: fix merge conflict

Fixes: #1141

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 target/linux/mediatek/image/filogic.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index bb0f499be6..ebafe306a6 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -938,7 +938,6 @@ define Device/qihoo_360t7
 endef
 TARGET_DEVICES += qihoo_360t7
 
-<<<<<<< HEAD
 define Device/qihoo_360t7-ubootmod
   DEVICE_VENDOR := Qihoo
   DEVICE_MODEL := 360T7