https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34339 --- Comment #1 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 153786 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153786&action=edit Bug 34339: (bug 33556 follow-up) Easy ERM-related changes I left the (easy) ERM cases out because it throws this when running the QA script: Processing files before patches |========================>| 51 / 51 (100.00%) An error occurred : Inconsistent hierarchy during C3 merge of class 'Koha::REST::V1::ERM::EHoldings::Titles::Local': current merge results [ Koha::REST::V1::ERM::EHoldings::Titles::Local, ] merging failed on 'Mojolicious::Controller' at /kohadevbox/qa-test-tools/koha-qa.pl line 112. and didn't want this to pollute the rest of the changes. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.