http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13726 Brendan Gallagher <brendan@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |brendan@bywatersolutions.co | |m --- Comment #4 from Brendan Gallagher <brendan@bywatersolutions.com> --- Auto-merging acqui/invoice.pl CONFLICT (content): Merge conflict in acqui/invoice.pl Auto-merging acqui/basket.pl CONFLICT (content): Merge conflict in acqui/basket.pl Auto-merging C4/Acquisition.pm CONFLICT (content): Merge conflict in C4/Acquisition.pm After applying 13719... -- You are receiving this mail because: You are watching all bug changes.