[rubygem-term-ansicolor/el5] removed cdiff/decolor due to conflict with colordiff package

[Jan Klepek]

commit 439da9440d1921650a8f6e658f1b7800bf8eb51f
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jul 23 21:19:48 2011 +0200

    removed cdiff/decolor due to conflict with colordiff package

 rubygem-term-ansicolor.spec |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/rubygem-term-ansicolor.spec b/rubygem-term-ansicolor.spec
index f544e84..194fcb9 100644
--- a/rubygem-term-ansicolor.spec
+++ b/rubygem-term-ansicolor.spec
@@ -43,15 +43,10 @@ do
         touch -r $F chopped
         mv chopped $F
 done
-<<<<<<< HEAD
-mv -f %{buildroot}%{gemdir}/bin %{buildroot}%{_prefix} 
-find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x
-=======
 # removing cdiff and decolor due to file conflict with colordiff package
 rm -rf %{buildroot}%{gemdir}/bin
 find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x
 
->>>>>>> master
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,10 +69,6 @@ rm -rf $RPM_BUILD_ROOT
 %{geminstdir}/*.rb
 %{geminstdir}/lib/
 %{geminstdir}/bin/
-<<<<<<< HEAD
-%{gemdir}/bin/decolor
-=======
->>>>>>> master
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec