Added basic MARC21 index definitions.

[koha.git] / about.pl

diff --git a/about.pl b/about.pl
index ef39f38..8076964 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -37,7 +37,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $kohaVersion   = C4::Context->config("kohaversion");
+my $kohaVersion   = C4::Context::KOHAVERSION;
 my $osVersion     = `uname -a`;
 my $perlVersion   = $];
 my $mysqlVersion  = `mysql -V`;
@@ -55,27 +55,15 @@ $template->param(
     apacheVersion => $apacheVersion,
     zebraVersion  => $zebraVersion,
 );
-
-<<<<<<< HEAD:about.pl
 my @component_names =
     qw/MARC::File::XML   MARC::Charset     Class::Accessor
        LWP::Simple       XML::Simple       Net::Z3950
        Event             Net::LDAP         PDF::API2
        Mail::Sendmail    MARC::Record      Digest::MD5
-       HTML::Template    DBD::mysql        Date::Manip
+       HTML::Template    DBD::mysql        
        DBI               Net::Z3950::ZOOM
        Date::Calc
       /;
-=======
-my @component_names = qw/MARC::File::XML   MARC::Charset     Class::Accessor
-  LWP::Simple       XML::Simple       Net::Z3950
-  Event             Net::LDAP         PDF::API2
-  Mail::Sendmail    MARC::Record      Digest::MD5
-  HTML::Template    DBD::mysql        Date::Manip
-  DBI               Smart::Comments   Net::Z3950::ZOOM
-  Date::Calc
-  /;
->>>>>>> perltidy:about.pl
 
 my @components = ();