[gtk-equinox-engine] Updated to new version Removed old gtk themes and added new ones Added dependency on Faenza icons

[Germán A. Racca]

commit e8707bb9fbb3405d9859ea6e6e354aed7a08bed8
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Wed Apr 20 16:19:07 2011 -0300

    Updated to new version
    Removed old gtk themes and added new ones
    Added dependency on Faenza icons

 .gitignore              |    2 ++
 gtk-equinox-engine.spec |   12 ------------
 sources                 |    1 +
 3 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8a4646..05ed499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 121881-equinox-1.20.tar.bz2
 /121881-equinox-1.20.tar.bz2
 /121881-equinox-1.30.tar.bz2
+/121881-equinox-1.40.tar.gz
+/140449-equinox-themes-1.40.tar.gz
diff --git a/gtk-equinox-engine.spec b/gtk-equinox-engine.spec
index f88338c..d894e18 100644
--- a/gtk-equinox-engine.spec
+++ b/gtk-equinox-engine.spec
@@ -3,17 +3,10 @@
 %global tarver 1.40
 %global tarthemes 140449-%{engine}-themes
 
-<<<<<<< HEAD
 Name:           gtk-equinox-engine
 Version:        1.40
 Release:        1%{?dist}
 Summary:        Equinox theme engine for GTK+ 2.x
-=======
-Name:		gtk-equinox-engine
-Version:	1.30.2
-Release:	2%{?dist}
-Summary:	Equinox theme engine for GTK+ 2.x
->>>>>>> 61602a1fbac0310d04ce73378642af5b239b0722
 
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -75,15 +68,10 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Equinox*
 
 %changelog
-<<<<<<< HEAD
 * Thu Apr 20 2011 Germán A. Racca <skytux at fedoraproject.org> 1.40-1
 - Updated to new version
 - Removed old gtk themes and added new ones
 - Added dependency on Faenza icons
-=======
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.30.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
->>>>>>> 61602a1fbac0310d04ce73378642af5b239b0722
 
 * Mon Oct 04 2010 Germán A. Racca <skytux at fedoraproject.org> 1.30.2-1
 - Updated to new version
diff --git a/sources b/sources
index c8c17b5..cdfee20 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8f4bf857d0ff559804a4aec215d54c27  121881-equinox-1.40.tar.gz
+d646f34aee2356fd03e3eb81e031c863  140449-equinox-themes-1.40.tar.gz