[Koha-bugs] [Bug 14576] Allow arbitrary automatic update of location on checkin
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Fri Oct 19 03:12:34 CEST 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14576
Alex Buckley <alexbuckley at catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
--- Comment #91 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Applying: Bug 14576: Allow arbitrary automatic update of location on checkin
Using index info to reconstruct a base tree...
M C4/Items.pm
M C4/Reserves.pm
M installer/data/mysql/sysprefs.sql
M
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/Reserves.pm
Auto-merging C4/Items.pm
CONFLICT (content): Merge conflict in C4/Items.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 14576: Allow arbitrary automatic update of location on
checkin
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-14576-Allow-arbitrary-automatic-update-of-loca-FkmjWf.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list