[Koha-bugs] [Bug 9163] Cataloguing validation workflow

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

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

Nick Clemens <nick at quecheelibrary.org> changed:

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

--- Comment #28 from Nick Clemens <nick at quecheelibrary.org> ---
I'd be happy to test and get this moving again but needs rebase

Applying: BUG 9163 - Cataloguing validation workflow
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/admin/preferences/cataloguing.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging cataloguing/addbooks.pl
Auto-merging cataloguing/addbiblio.pl
Failed to merge in the changes.
Patch failed at 0001 BUG 9163 - Cataloguing validation workflow
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-9163---Cataloguing-validation-workflow-_DFxmQ.patch

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