[Koha-bugs] [Bug 10963] Simplified creation of MARC21 sample frameworks

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

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

Mirko Tietgen <mirko at abunchofthings.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mirko at abunchofthings.net

--- Comment #41 from Mirko Tietgen <mirko at abunchofthings.net> ---
Patch does not apply. I already did half the test plan, I'd continue testing if
you'd rebase it.

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 10963 - Simplified creation - FA framework
Applying: Bug 10963 - Simplified creation - BKS framework
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
Failed to merge in the changes.

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