[Koha-bugs] [Bug 10500] Improve isbn matching when importing records

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #3 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
tested on a biblibre sandbox:
pplying: Bug 10500 - Improve isbn matching when importing records
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Koha.pm
Auto-merging C4/Matcher.pm
CONFLICT (content): Merge conflict in C4/Matcher.pm
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging t/Koha.t
CONFLICT (content): Merge conflict in t/Koha.t
Failed to merge in the changes.

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