git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e1cb7db)
dpkg: fix merge
authorMartin Jansa <Martin.Jansa@gmail.com>
Mon, 12 Apr 2010 16:12:53 +0000 (18:12 +0200)
committerMartin Jansa <Martin.Jansa@gmail.com>
Mon, 12 Apr 2010 16:13:19 +0000 (18:13 +0200)
recipes/dpkg/dpkg-native_1.13.22.bb patch | blob | history
recipes/dpkg/dpkg_1.13.22.bb patch | blob | history

diff --git a/recipes/dpkg/dpkg-native_1.13.22.bb b/recipes/dpkg/dpkg-native_1.13.22.bb
index d3fe2a1..c33b389 100644 (file)
--- 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 2a941dd..766b108 100644 (file)
--- 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
Clone of mainline OpenEmbedded repository