View | Details | Raw Unified | Return to bug 8130
Collapse All | Expand All

(-)a/installer/data/mysql/updatedatabase.pl (-2 lines)
Lines 5308-5314 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5308
    SetVersion ($DBversion);
5308
    SetVersion ($DBversion);
5309
}
5309
}
5310
5310
5311
<<<<<<< HEAD
5312
$DBversion = "3.09.00.010";
5311
$DBversion = "3.09.00.010";
5313
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5312
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5314
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IssueLostItem', 'alert', 'alert|confirm|nothing', 'Defines what should be done when an attempt is made to issue an item that has been marked as lost.', 'Choice')");
5313
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IssueLostItem', 'alert', 'alert|confirm|nothing', 'Defines what should be done when an attempt is made to issue an item that has been marked as lost.', 'Choice')");
5315
- 

Return to bug 8130