https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20718
Cab Vinton <bibli...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |bibli...@gmail.com
--- Comment #7 from Cab Vinton <bibli...@gmail.com> ---
Tried applying the patch to several sandboxes, but without success.
<h1>Something went wrong !</h1>Applying: Bug 20718 - Add ability to have lists
that are available to all list editors
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 20718 - Add ability to have lists that are available
to all list editors
The copy of the patch that failed is found in: .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.
Bug 20718 - Add ability to have lists that are available to all list editors
75201 - Bug 20718 - Add ability to have lists that are available to all list
editors
76944 - Bug 20718: Add missing POD
Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-20718---Add-ability-to-have-lists-that-are-ava-4FEpmq.patch .
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://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/
