https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29330
--- Comment #59 from David Cook <[email protected]> --- (In reply to Victor Grousset/tuxayo from comment #50) > No actual dependency it seems. bug 28803 adds a catch and this patch adds > code in the try. So you're saying that the merge conflict is just due to the surrounding lines being different so it can't auto-merge without manual intervention? That's not so bad. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
