http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13726
Brendan Gallagher <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |m --- Comment #4 from Brendan Gallagher <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
