[Koha-bugs] [Bug 8994] Make FindDuplicateAuthority behaviour customizable

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Tue Mar 3 11:43:37 CET 2015


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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |paola.rossi at cineca.it

--- Comment #5 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply the patch against master 3.19.00.012 head 13731

Applying: MT9496: Improve FindDuplicateAuthority
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/AuthoritiesMarc.pm
CONFLICT (content): Merge conflict in C4/AuthoritiesMarc.pm
Failed to merge in the changes.

So I pass 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