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

diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
index 4b9f245c3cca1accbcaa42b18b52b13f7780faf5..94b9c45e7c24eeeef8ad44c485fb218d93f23d4e 100644 (file)
--- 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