https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11375 Maryse Simard <maryse.simard@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |maryse.simard@inlibro.com --- Comment #24 from Maryse Simard <maryse.simard@inlibro.com> --- Patch doesn't apply Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11375: Improve patrons permissions display Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Removing koha-tmpl/intranet-tmpl/prog/css/treeview/jquery.treeview.css Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-red-line.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-gray-line.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-famfamfam-line.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-default-line.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/treeview-black-line.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/plus.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/minus.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/folder-closed.gif Removing koha-tmpl/intranet-tmpl/prog/css/treeview/images/file.gif Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss Removing koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.treeview.pack.js error: Failed to merge in the changes. Patch failed at 0001 Bug 11375: Improve patrons permissions display 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/Bug-11375-Improve-patrons-permissions-display-P1z7Qv.patch -- You are receiving this mail because: You are watching all bug changes.