[Koha-bugs] [Bug 11559] Professional cataloger's interface

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

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

David Cook <dcook at prosentient.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA

--- Comment #15 from David Cook <dcook at prosentient.com.au> ---
Applying: Bug 11559 - Rancor: professional cataloging interface
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 11559 - Rancor: professional cataloging interface

I think this might be caused by a whitespace difference?

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