It looks like this patch has a bit of conflict management text still in it?
On Thu, Oct 6, 2011 at 7:56 AM, <[email protected]> wrote: > From: Tomas Cohen Arazi <[email protected]> > > Signed-off-by: Marcel de Rooy <[email protected]> > August 10, 2011: Fixed some small typos. > > Signed-off-by: Paul Poulain <[email protected]> > Oct 7th, 2011: rebased for master > --- > installer/data/mysql/updatedatabase.pl | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/installer/data/mysql/updatedatabase.pl > b/installer/data/mysql/updatedatabase.pl > index 6b88c29..8560a21 100755 > --- a/installer/data/mysql/updatedatabase.pl > +++ b/installer/data/mysql/updatedatabase.pl > @@ -4399,6 +4399,7 @@ if (C4::Context->preference("Version") < > TransformToNum($DBversion)) { > SetVersion($DBversion); > } HERE -------------v > +<<<<<<< HEAD > $DBversion = "3.05.00.009"; > if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, > branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, > timestamp, issuedate) > @@ -4446,6 +4447,11 @@ if (C4::Context->preference("Version") < > TransformToNum($DBversion)) { > SetVersion($DBversion); > } > > +$DBversion = "3.05.00.XXX"; > +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > + print "RELTERMS category available for relator terms. They are not > loaded during upgrade but can be easily inserted using the provided > marc21_relatorterms.sql SQL script.\n"; > + SetVersion($DBversion); > +} > > =head1 FUNCTIONS > > -- > 1.7.4.1 > > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ > _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
