[gdesklets] remove head declaration

[Luya Tshimbalanga]

commit 548e2cb61707e332aba043e37da731de0740f81a
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sat Apr 7 23:52:31 2012 -0700

    remove head declaration

 gdesklets.spec |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/gdesklets.spec b/gdesklets.spec
index a69d1d6..e12eb32 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -1,15 +1,12 @@
 #%define alphatag beta
 
 Name:		gdesklets
-<<<<<<< HEAD
 Version:		0.36.3
 Release:		3%{?dist}
 Summary:		Architecture for desktop applets
-=======
 Version:	0.36.3
 Release:	5%{?dist}
 Summary:	Architecture for desktop applets
->>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
 
 Group:		User Interface/Desktops
 License:		GPL+
@@ -17,12 +14,9 @@ License:		GPL+
 URL:			http://%{name}.de/
 Source0:		http://%{name}.de/files/%{name}-%{version}.tar.bz2
 Patch0:		transition.patch
-<<<<<<< HEAD
 Patch1:		gdesklets-desktop.patch
-=======
 Patch1:		vfs.patch
 
->>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python3-devel > 3.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
@@ -43,11 +37,9 @@ bars, weather sensors, news tickers.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .transition
-<<<<<<< HEAD
 %patch1 -p3 -b .gdesklets-desktop
-=======
-%patch1 -p0 -b .vfs
->>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
+%patch2 -p0 -b .vfs
+
 
 %build
 %configure \
@@ -99,12 +91,11 @@ rm -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
 * Tue Mar 20 2012 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-3
 - Adhered to Fedora guideline for desktop declaration
 - Ported patch from OpenSuse spec version
 - Patch addressing memory leak (rhbz #747420, launchpad #190894)
-=======
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -114,7 +105,6 @@ rm -rf %{buildroot}
 * Sun Dec 05 2011 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-3
 - Patch for vfs declaration (rhbz#740610)
 - Added gvfs-devel and python3-devel for BuildRequires
->>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild