[Koha-bugs] [Bug 12896] Move the bookseller-related code into its own module

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896

--- Comment #18 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply against master 3.17.00.035 (head bug 13088)

At first I applied 12852 (OK).

Then:
Applying: Bug 12896: Move the bookseller-related code into
Koha::Acquisition::Bookseller
Using index info to reconstruct a base tree...
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

I keep the patch in the "Patch doesn't apply" status.

-- 
You are receiving this mail because:
You are watching all bug changes.