https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28173
David Nind <da...@davidnind.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |da...@davidnind.com
Status|Needs Signoff |Patch doesn't apply
--- Comment #9 from David Nind <da...@davidnind.com> ---
The patch no longer applies (not unexpected!).
Not sure about the comments after the patch 8-)
git bz apply 28173
Bug 28173 - Add plugin hooks object_store_pre and object_store_post
119872 - Bug 28173: Add plugin hooks object_store_pre and object_store_post
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 28173: Add plugin hooks object_store_pre and object_store_post
Using index info to reconstruct a base tree...
M Koha/Object.pm
A t/lib/Koha/Plugin/Test.pm
Falling back to patching base and 3-way merge...
Auto-merging t/lib/plugins/Koha/Plugin/Test.pm
CONFLICT (content): Merge conflict in t/lib/plugins/Koha/Plugin/Test.pm
Auto-merging Koha/Object.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 28173: Add plugin hooks object_store_pre and
object_store_post
...
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
