[oe-commits] Martin Jansa : openmoko-alsa-scenarios: fix merge

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: a9da140d064113fdd03899ab9b1774ee2773608d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a9da140d064113fdd03899ab9b1774ee2773608d

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Jan  7 11:12:57 2010 +0100

openmoko-alsa-scenarios: fix merge

---

 recipes/openmoko2/openmoko-alsa-scenarios.bb |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/recipes/openmoko2/openmoko-alsa-scenarios.bb b/recipes/openmoko2/openmoko-alsa-scenarios.bb
index 416d40d..72edfef 100644
--- a/recipes/openmoko2/openmoko-alsa-scenarios.bb
+++ b/recipes/openmoko2/openmoko-alsa-scenarios.bb
@@ -1,13 +1,9 @@
 DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
 PV = "1.0+svnr${SRCPV}"
-<<<<<<< HEAD
-PR = "r1"
-=======
 PR = "r2"
 
 PROVIDES = "virtual/alsa-scenarios"
->>>>>>> origin/org.openembedded.dev
 
 COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"