git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5abdfdc)
xfce-base apps: convert to new style staging
authorKoen Kooi <koen@openembedded.org>
Fri, 23 Apr 2010 11:46:45 +0000 (13:46 +0200)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 4 Apr 2011 19:15:39 +0000 (20:15 +0100)
recipes/xfce-base/xfce4-panel_4.6.3.bb patch | blob | history

diff --git a/recipes/xfce-base/xfce4-panel_4.6.3.bb b/recipes/xfce-base/xfce4-panel_4.6.3.bb
index 0642663..03ab4e8 100644 (file)
--- a/recipes/xfce-base/xfce4-panel_4.6.3.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.3.bb
@@ -3,7 +3,6 @@
 DESCRIPTION = "Xfce4 Panel"
 DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
 SECTION = "x11"
-<<<<<<< HEAD
 PR = "r2"
 
 inherit xfce46
Clone of mainline OpenEmbedded repository