[Koha-bugs] [Bug 13952] Import and export of authority types

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

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

--- Comment #32 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply, not sure how to fix, sorry!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 13952: Import and export authority types
Using index info to reconstruct a base tree...
M       admin/import_export_framework.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
Auto-merging admin/import_export_framework.pl
CONFLICT (content): Merge conflict in admin/import_export_framework.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 13952: Import and export authority types
The copy of the patch that failed is found in: .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-13952-Import-and-export-authority-types-CLgCHQ.patch

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