https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17698
Victor Grousset/tuxayo <victor.grous...@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |victor.grous...@biblibre.co | |m Status|Needs Signoff |Patch doesn't apply --- Comment #34 from Victor Grousset/tuxayo <victor.grous...@biblibre.com> --- ~/d/koha ❯❯❯ git bz apply 17698 Bug 17698 - Make patron notes show up on staff dashboard 71100 - Bug 17698: Make patron notes show up on staff dashboard 71126 - Bug 17698: [FOLLOW-UP] Changing to Koha Objects style, adding circ sidebar 71127 - Bug 17698: [FOLLOW-UP] Koha Objects, access borrower through patron sub Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17698: Make patron notes show up on staff dashboard Using index info to reconstruct a base tree... M installer/data/mysql/kohastructure.sql M installer/data/mysql/userpermissions.sql M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt M koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt M mainpage.pl Falling back to patching base and 3-way merge... Auto-merging mainpage.pl CONFLICT (content): Merge conflict in mainpage.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging installer/data/mysql/userpermissions.sql Auto-merging installer/data/mysql/kohastructure.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 17698: Make patron notes show up on staff dashboard 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-17698-Make-patron-notes-show-up-on-staff-dashb-H6e7WQ.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/