From a65b01a44264ba66a8cdd5c056c578c47b500e06 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Apr 2010 13:46:45 +0200
Subject: [PATCH] xfce-base apps: convert to new style staging

---
 recipes/xfce-base/xfce4-panel_4.6.3.bb | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.39.5