[Koha-bugs] [Bug 14884] New: Test failure from Bug 14470

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884

            Bug ID: 14884
           Summary: Test failure from Bug 14470
 Change sponsored?: ---
           Product: Koha
           Version: 3.20
          Hardware: All
                OS: All
            Status: NEW
          Severity: critical
          Priority: P5 - low
         Component: Circulation
          Assignee: koha-bugs at lists.koha-community.org
          Reporter: robin at catalyst.net.nz
        QA Contact: testopia at bugs.koha-community.org
                CC: gmcharlt at gmail.com, kyle.m.hall at gmail.com

#   Failed test './t/db_dependent/Circulation.t contains merge conflict markers
in line 599'
#   at t/00-merge-conflict-markers.t line 51.
# Looks like you failed 1 test of 8394.
t/00-merge-conflict-markers.t ....... 
Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/8394 subtests 


<<<<<<< HEAD
=======
{
    # Don't allow renewing onsite checkout
    my $barcode  = 'R00000XXX';
    my $branch   = 'CPL';

...

}

$schema->storage->txn_rollback();
>>>>>>> ea92a92... Bug 14470: Do not allow renew for on-site checkouts

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.