[oe-commits] Stefan Schmidt : connman_0.10: Fix merge error.

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: e73f13dd16918cc943941311429a0a93a16302be
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e73f13dd16918cc943941311429a0a93a16302be

Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Mon Mar 23 13:32:12 2009 +0100

connman_0.10: Fix merge error.

---

 packages/connman/connman_0.10.bb |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb
index a220d88..c2bb92b 100644
--- a/packages/connman/connman_0.10.bb
+++ b/packages/connman/connman_0.10.bb
@@ -30,11 +30,7 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
-<<<<<<< HEAD:packages/connman/connman_0.10.bb
-  ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
-=======
   http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
->>>>>>> 82e5731... connman: Moved from moblin.org to kernel.org:packages/connman/connman_0.10.bb
   file://connman \
 "