[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

Hugo Agud <hagud at orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |hagud at orex.es

--- Comment #68 from Hugo Agud <hagud at orex.es> ---
Applying: Bug 13952: Import and export authority types
Using index info to reconstruct a base tree...
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
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
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:
   /home/vagrant/kohaclone/.git/rebase-apply/patch

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