From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Apr 2010 11:46:45 +0000 (+0200)
Subject: xfce-base apps: convert to new style staging
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a65b01a44264ba66a8cdd5c056c578c47b500e06;p=openembedded.git

xfce-base apps: convert to new style staging
---

diff --git a/recipes/xfce-base/xfce4-panel_4.6.3.bb b/recipes/xfce-base/xfce4-panel_4.6.3.bb
index 0642663f53..03ab4e8a5d 100644
--- 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