https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10943
Victor Grousset/tuxayo <victor.grous...@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |victor.grous...@biblibre.co | |m --- Comment #15 from Victor Grousset/tuxayo <victor.grous...@biblibre.com> --- ~/d/koha ❯❯❯ git bz apply 10943 Bug 10943 - Impossible to manage fines without borrowers permission 35355 - [SIGNED OFF] Bug 10943 - Impossible to manage fines without borrowers permission Added check for borrowers permission as that is also required when accessing fines. 70597 - Bug 10943: Manage files without borrowers permission Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10943 - Impossible to manage fines without borrowers permission Added check for borrowers permission as that is also required when accessing fines. Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 10943 - Impossible to manage fines without borrowers permission Added check for borrowers permission as that is also required when accessing fines. 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". Patch left in /tmp/SIGNED-OFF-Bug-10943---Impossible-to-manage-fines--VbHqCV.patch -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ 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/