[perl-SNMP-Info/el5] Update to version 2.06

[gouldwp]

commit 681ca6e0f8ef8d431d531e8134f95556541d1b02
Author: Walter Gould <gouldwp at fedoraproject.org>
Date:   Sun Oct 16 16:16:36 2011 -0500

    Update to version 2.06

 perl-SNMP-Info.spec |   14 --------------
 sources             |    4 ----
 2 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/perl-SNMP-Info.spec b/perl-SNMP-Info.spec
index c2f9c1c..a8d45d8 100644
--- a/perl-SNMP-Info.spec
+++ b/perl-SNMP-Info.spec
@@ -1,19 +1,11 @@
 Name:           perl-SNMP-Info
-<<<<<<< HEAD
-Version:        2.01 
-=======
 Version:        2.06 
->>>>>>> master
 Release:        1%{?dist}
 Summary:        Object Oriented Perl5 Interface to Network devices and MIBs through SNMP
 License:        BSD
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/SNMP-Info/
-<<<<<<< HEAD
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MAXB/SNMP-Info-%{version}.tar.gz
-=======
 Source0:        http://search.cpan.org/CPAN/authors/id/O/OL/OLIVER/SNMP-Info-%{version}.tar.gz
->>>>>>> master
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -27,10 +19,7 @@ through SNMP.
 
 %prep
 %setup -q -n SNMP-Info-%{version}
-<<<<<<< HEAD
-=======
 /usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
->>>>>>> master
 /usr/bin/iconv -f iso8859-1 -t utf-8 README > README.conv && /bin/mv -f README.conv README
 /usr/bin/iconv -f iso8859-1 -t utf-8 Info.pm > Info.pm.conv && /bin/mv -f Info.pm.conv Info.pm
 
@@ -61,10 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-<<<<<<< HEAD
-=======
 * Thu Oct 06 2011 <walt at gouldfamily.org> 2.06-1
 - upgrade to 2.06
->>>>>>> master
 * Thu Jun 18 2009 <walt at gouldfamily.org> 2.01-1
 - upgrade to 2.01
diff --git a/sources b/sources
index 8410348..6700607 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d58af8e67f9dba1d7a8971358a256fc3  SNMP-Info-2.01.tar.gz
-=======
 b66e5744697dc0ca7157df2e3eddb8ee  SNMP-Info-2.06.tar.gz
->>>>>>> master