https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27123
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #9 from Katrin Fischer <[email protected]> --- I am sorry, Jérémy, this no longer applies. I fixed the first conflict, but got stuck on the second: Applying: Bug 27123: Add messages to batch patrons modification Applying: Bug 27123: whitespaces deleted Applying: Bug 27123: Delete useless code error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt). error: could not build fake ancestor Patch failed at 0001 Bug 27123: Delete useless code hint: Use 'git am --show-current-patch=diff' to see the failed 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-27123-Delete-useless-code-g_KXIH.patch Can you please rebase? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
