Fixed malformed patch for xt-q8l-v10

2018-12-15 18:36:04 +00:00 · 2018-12-15 18:36:04 +00:00 · f93cf268f5
commit f93cf268f5
parent 6bae467522
1 changed files with 0 additions and 1 deletions
--- a/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch
+++ b/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch
@ -1,7 +1,6 @@
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts	2018-12-06 21:46:51.493688015 +0000
@@ -0,0 +1,966 @@
->>>>>>> c39396fd4027a4ee45eb87ba17e2e0aa7fb89a04
 +/*
 + * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
 + * 					   2018 Paolo Sabatino <paolo.sabatino@gm**l.com>