fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mediatek: fix merge conflict

Browse Source 
Fixes: #1141

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-12-30 12:01:55 +08:00
parent e9179e05d8
commit 2437a8a019
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/mediatek/image/filogic.mk
View File

@ -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