From fc6fd10ff9cb87af8fd2104c83a578847cd09e44 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Tue, 22 Jul 2008 11:25:10 +0000
Subject: openmoko-today2-folders: fix conflicts as we moved some components of
 Sato desktop

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4921 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'meta-openmoko')

diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
index 4b9f245c3..94b9c45e7 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The Openmoko Today2 vfolder files"
 SECTION = "openmoko/misc"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r3"
-RCONFLICTS_${PN} = "matchbox-common"
+PR = "r4"
+RCONFLICTS_${PN} = "matchbox-desktop-sato"
 
 inherit openmoko2
 
-- 
cgit v1.2.3