http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896
Jonathan Druart <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #20 from Jonathan Druart <[email protected]> --- (In reply to Paola Rossi from comment #18) There only was a small conflict on the number of unit tests. > Falling back to patching base and 3-way merge... > error: The following untracked working tree files would be overwritten by > merge: > Koha/Acquisition/Bookseller.pm > Please move or remove them before you can merge. > Aborting > Failed to merge in the changes. > Patch failed at 0001 Bug 12896: Move the bookseller-related code into > Koha::Acquisition::Bookseller You should remove the file and retry to apply this patch. Back to needs signoff. -- 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/
