http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5335
Paul Poulain <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #20 from Paul Poulain <[email protected]> --- conflict again = CONFLICT (content): Merge conflict in C4/Acquisition.pm Auto-merging acqui/finishreceive.pl CONFLICT (content): Merge conflict in acqui/finishreceive.pl Auto-merging acqui/orderreceive.pl CONFLICT (content): Merge conflict in acqui/orderreceive.pl Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl This patch is quite large, I fear it will conflict a lot. If it has been signed-off by Pierre already, as it's a dev that is in production for one BibLibre customer, I think it's OK to mark it "signed-off" once you've rebased it. [Katrin, if you can test it quickly, you'll be more than welcomed ;-) ] (and I'll test once again before pushing) -- You are receiving this mail because: You are the QA Contact for the bug. 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/
