From 35d01e4b5bf8a4bf733917de5a5c29f85c6f5a35 Mon Sep 17 00:00:00 2001
From: moisan <thierry.moisan@gmail.com>
Date: Mon, 9 Feb 2009 15:04:09 -0500
Subject: [PATCH] Fix strange strings in some pod files

---
 pod/Matrix.pod        | 6 ------
 pod/MatrixComplex.pod | 9 ---------
 2 files changed, 15 deletions(-)

diff --git a/pod/Matrix.pod b/pod/Matrix.pod
index b35e3f1..3af355b 100644
--- a/pod/Matrix.pod
+++ b/pod/Matrix.pod
@@ -750,21 +750,15 @@ sub _multiplication {
 
 sub _equal {
     my ($left, $right) = @_;
-<<<<<<< HEAD:pod/Matrix.pod
     return 0;
-=======
     my $comp = Array::Compare->new;
     return ($comp->compare([$left->as_list], [$right->as_list]));
->>>>>>> b2d551f34dd60416d7f1a3d7ee572e078ea7986c:pod/Matrix.pod
 }
 
 sub _not_equal {
     my ($left, $right) = @_;
-<<<<<<< HEAD:pod/Matrix.pod
     return 0;
-=======
     return !(&_equal($left, $right));
->>>>>>> b2d551f34dd60416d7f1a3d7ee572e078ea7986c:pod/Matrix.pod
 }
 
 sub _dot_product {
diff --git a/pod/MatrixComplex.pod b/pod/MatrixComplex.pod
index 2d2e332..0165b82 100644
--- a/pod/MatrixComplex.pod
+++ b/pod/MatrixComplex.pod
@@ -26,10 +26,7 @@ use overload
     '!='     => \&_not_equal,
 #    'abs'    => \&_abs,
     fallback => 1;
-<<<<<<< HEAD:pod/MatrixComplex.pod
-=======
 use Array::Compare;
->>>>>>> b2d551f34dd60416d7f1a3d7ee572e078ea7986c:pod/MatrixComplex.pod
 #use strict;
 @EXPORT_OK = qw/
                 gsl_matrix_complex_alloc
@@ -161,21 +158,15 @@ sub _subtract {
 
 sub _equal {
     my ($left, $right) = @_;
-<<<<<<< HEAD:pod/MatrixComplex.pod
     return 0;
-=======
     my $comp = Array::Compare->new;
     return ($comp->compare([$left->as_list], [$right->as_list]));
->>>>>>> b2d551f34dd60416d7f1a3d7ee572e078ea7986c:pod/MatrixComplex.pod
 }
 
 sub _not_equal {
     my ($left, $right) = @_;
-<<<<<<< HEAD:pod/MatrixComplex.pod
     return 0;
-=======
     return !(&_equal($left, $right));
->>>>>>> b2d551f34dd60416d7f1a3d7ee572e078ea7986c:pod/MatrixComplex.pod
 }
 
 sub copy {
-- 
2.11.4.GIT