[drupal6-imagecache_profiles/el6] Fix merging

[Peter Borsa]

commit a14b12023d6276faa09e21ddb2aec3b51d858349
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Nov 28 10:22:00 2013 +0100

    Fix merging

 .gitignore                       |    3 ---
 drupal6-imagecache_profiles.spec |   22 ----------------------
 sources                          |    4 ----
 3 files changed, 0 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ff2fc4..752f4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
 /imagecache_profiles-6.x-1.3.tar.gz
-<<<<<<< HEAD
-=======
 /imagecache_profiles-6.x-1.4-rc1.tar.gz
->>>>>>> master
diff --git a/drupal6-imagecache_profiles.spec b/drupal6-imagecache_profiles.spec
index f557b04..7a5c7f4 100644
--- a/drupal6-imagecache_profiles.spec
+++ b/drupal6-imagecache_profiles.spec
@@ -6,16 +6,6 @@
 %{!?drupal: %{expand: %%global drupal drupal}}
 # e.g. "/usr/share/drupal6"
 %global drupalbase           %{_datadir}/%{drupal}
-<<<<<<< HEAD
-%global drupal_sites_all    %{drupalbase}/sites/all        
-%global drupal_modules      %{drupal_sites_all}/modules
-# Use upstream name as expressed in URL and tarball
-%global modname             imagecache_profiles
-
-Name:    drupal%{drupalver}-%{modname}
-Version: 1.3
-Release: 3%{?dist}
-=======
 %global drupal_sites_all    %{drupalbase}/sites/all
 %global drupal_modules      %{drupal_sites_all}/modules
 # Use upstream name as expressed in URL and tarball
@@ -25,16 +15,11 @@ Release: 3%{?dist}
 Name:    drupal%{drupalver}-%{modname}
 Version: 1.4
 Release: 0.1.%{pre_release}%{?dist}
->>>>>>> master
 Summary: Image Cache Profiles Module for Drupal6
 Group:   Applications/Publishing
 License: GPLv2
 URL:     http://drupal.org/project/%{modname}
-<<<<<<< HEAD
-Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}.tar.gz
-=======
 Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}-%{pre_release}.tar.gz
->>>>>>> master
 Source1: %{name}-fedora-README.txt
 Source2: LICENSE.txt
 BuildArch: noarch
@@ -44,11 +29,7 @@ Requires:  drupal6, drupal6-imagecache
 %description
 ImageCache_Profiles module allows you to set user profile pictures that are
 consistent throughout your site and allows avatars on the user profile
-<<<<<<< HEAD
-pages, nodes and comments to be a different size. 
-=======
 pages, nodes and comments to be a different size.
->>>>>>> master
 
 %prep
 %setup -qn %{modname}
@@ -77,13 +58,10 @@ rm -rf %{buildroot}
 %{drupal_modules}/%{modname}
 
 %changelog
-<<<<<<< HEAD
-=======
 * Thu Nov 28 2013 Peter Borsa <peter.borsa at gmail.com> - 1.4-0.1.rc1
 - Update to upstream 1.4-rc1 release for bug fixes
 - Upstream changelog for this release is available at https://drupal.org/node/1304356
 
->>>>>>> master
 * Thu Jun 7 2012 Anderson Silva <ansilva at redhat.com> - 1.3-3
 - Update LICENSE.txt with FSF mailing address
 - Update description
diff --git a/sources b/sources
index beceb01..7488269 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5161c3ab2f2c30ab0f9dfbeaf2a5e17d  imagecache_profiles-6.x-1.3.tar.gz
-=======
 ab5947d950d8258fa3856807df2387b0  imagecache_profiles-6.x-1.4-rc1.tar.gz
->>>>>>> master