[oe-commits] org.oe.dev u-boot-mkimage-gta01-native_oe.bb: remove conflicting patch

[koen commit]

u-boot-mkimage-gta01-native_oe.bb: remove conflicting patch

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 56cb22234fc44174022b0ec322bb5a7173d4ba1a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=56cb22234fc44174022b0ec322bb5a7173d4ba1a
Files:
1
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
Diffs:

#
# mt diff -r3f578fcf74e37d012b104754e3387f72f82fa832 -r56cb22234fc44174022b0ec322bb5a7173d4ba1a
#
# 
# 
# patch "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
#  from [148eadcd4b31c1fc73879e61409c8db14331aaeb]
#    to [d2ac07afa8091ccc0ab72e917cab17dad786d31e]
# 
============================================================
--- packages/uboot/u-boot-mkimage-gta01-native_oe.bb	148eadcd4b31c1fc73879e61409c8db14331aaeb
+++ packages/uboot/u-boot-mkimage-gta01-native_oe.bb	d2ac07afa8091ccc0ab72e917cab17dad786d31e
@@ -5,7 +5,6 @@ file://ext2load_hex.patch;patch=1 \
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
 file://uboot-machtypes.patch;patch=1 \
 file://ext2load_hex.patch;patch=1 \
-file://uboot-mokoversion.patch;patch=1 \
 file://uboot-s3c2410-warnings-fix.patch;patch=1 \
 file://uboot-strtoul.patch;patch=1 \
 file://uboot-cramfs_but_no_jffs2.patch;patch=1 \