[Koha-bugs] [Bug 20447] Add support for MARC holdings records

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20447

Hugo Agud <hagud at orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #25 from Hugo Agud <hagud at orex.es> ---
Apply? [(y)es, (n)o, (i)nteractive] y 
Applying: Bug 20447: MARC Holdings support
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Deleteditem.pm
M       Koha/Schema/Result/Item.pm
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging Koha/Schema/Result/Item.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Item.pm
Auto-merging Koha/Schema/Result/Deleteditem.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Deleteditem.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 20447: MARC Holdings support
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-20447-MARC-Holdings-support-B8w5Re.patch

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