[oe-commits] Sebastian Spaeth : python-pygobject: Clean up remaining merge conflict

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 0094f64814a84acbdc5dc32f74cf10df74b7d218
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0094f64814a84acbdc5dc32f74cf10df74b7d218

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Fri Oct 30 12:37:59 2009 +0100

python-pygobject: Clean up remaining merge conflict

---

 recipes/python/python-pygobject_2.20.0.bb |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb
index 58d8cf1..2a07a4a 100644
--- a/recipes/python/python-pygobject_2.20.0.bb
+++ b/recipes/python/python-pygobject_2.20.0.bb
@@ -30,11 +30,8 @@ do_stage() {
 
 PACKAGES += "${PN}-lib"
 
-<<<<<<< HEAD:recipes/python/python-pygobject_2.20.0.bb
-=======
 RDEPENDS_${PN} += "python-textutils"
 
->>>>>>> org.openembedded.dev:recipes/python/python-pygobject_2.20.0.bb
 FILES_${PN} = "${libdir}/python*"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir} ${datadir}"