[Koha-bugs] [Bug 10402] Add multiple contacts for vendors

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Tue Jul 8 12:07:28 CEST 2014


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

Paola Rossi <paola.rossi at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Failed QA                   |Patch doesn't apply

--- Comment #68 from Paola Rossi <paola.rossi at cineca.it> ---
[I beg your pardon.]

I've tried to apply against master 3.17.00.009

Applying: Bug 10402 follow-up: choose contacts for claims
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Letters.t
CONFLICT (content): Merge conflict in t/db_dependent/Letters.t
Auto-merging t/db_dependent/Bookseller.t
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.

I've passed the patch to "Patch doesn't apply" status.

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


More information about the Koha-bugs mailing list