summaryrefslogtreecommitdiff
path: root/meta-openmoko
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openmoko')
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
index 4b9f245c3c..94b9c45e7c 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