[gdesklets/f14/master] updated spec

[Luya Tshimbalanga]

commit e9bd30a4c6aa1704d9dfd1ae7f69f08c873a59e4
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Thu Jan 27 03:18:23 2011 -0800

    updated spec

 gdesklets.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/gdesklets.spec b/gdesklets.spec
index 604d6d9..e0f9606 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -81,12 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Jan 26 2011 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-1
 - New upstream version
 
->>>>>>> master
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.36.2-3
 - recompiling .py files against Python 2.7 (rhbz#623304)