mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
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
This commit is contained in:
parent
686752960b
commit
fc6fd10ff9
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user