From 8195be90301213d5a9c65d511e301e611903bc2c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 12 Apr 2010 18:12:53 +0200 Subject: dpkg: fix merge --- recipes/dpkg/dpkg-native_1.13.22.bb | 3 --- recipes/dpkg/dpkg_1.13.22.bb | 3 --- 2 files changed, 6 deletions(-) diff --git a/recipes/dpkg/dpkg-native_1.13.22.bb b/recipes/dpkg/dpkg-native_1.13.22.bb index d3fe2a1b90..c33b38978f 100644 --- a/recipes/dpkg/dpkg-native_1.13.22.bb +++ b/recipes/dpkg/dpkg-native_1.13.22.bb @@ -1,9 +1,6 @@ require dpkg-native.inc PR = "r5" -<<<<<<< HEAD -======= SRC_URI[md5sum] = "0fc9fffc2c2cfa7107d8f422815078c1" SRC_URI[sha256sum] = "c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f" ->>>>>>> b6d0763... recipes: add missing checksums diff --git a/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb index 2a941dddd8..766b10883d 100644 --- a/recipes/dpkg/dpkg_1.13.22.bb +++ b/recipes/dpkg/dpkg_1.13.22.bb @@ -10,9 +10,6 @@ EXTRA_OECONF = "--without-static-progs \ --with-bz2lib \ --without-sgml-doc \ PERL=/usr/bin/perl" -<<<<<<< HEAD -======= SRC_URI[md5sum] = "0fc9fffc2c2cfa7107d8f422815078c1" SRC_URI[sha256sum] = "c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f" ->>>>>>> b6d0763... recipes: add missing checksums -- cgit 1.2.3-korg