http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9326 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #8 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 9326, 7167: Add a "execute anyway" link for versions already executed Using index info to reconstruct a base tree... A C4/Update/Database.pm A admin/updatedatabase.pl A koha-tmpl/intranet-tmpl/prog/en/modules/admin/updatedatabase.tt Falling back to patching base and 3-way merge... CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/modules/admin/updatedatabase.tt deleted in HEAD and modified in Bug 9326, 7167: Add a "execute anyway" link for versions already executed. Version Bug 9326, 7167: Add a "execute anyway" link for versions already executed of koha-tmpl/intranet-tmpl/prog/en/modules/admin/updatedatabase.tt left in tree. CONFLICT (modify/delete): admin/updatedatabase.pl deleted in HEAD and modified in Bug 9326, 7167: Add a "execute anyway" link for versions already executed. Version Bug 9326, 7167: Add a "execute anyway" link for versions already executed of admin/updatedatabase.pl left in tree. CONFLICT (modify/delete): C4/Update/Database.pm deleted in HEAD and modified in Bug 9326, 7167: Add a "execute anyway" link for versions already executed. Version Bug 9326, 7167: Add a "execute anyway" link for versions already executed of C4/Update/Database.pm left in tree. Patch failed at 0001 Bug 9326, 7167: Add a "execute anyway" link for versions already executed The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.