https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10190
Chloé Zermatten <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #226 from Chloé Zermatten <[email protected]> --- (In reply to Clemens Tubach from comment #223) > Unfortunately, the patch doesn't apply: > > Applying: Bug 10190: (QA follow-up): Fix removal of tables > Using index info to reconstruct a base tree... > A installer/data/mysql/atomicupdate/bug_10190.pl > Falling back to patching base and 3-way merge... > CONFLICT (modify/delete): installer/data/mysql/atomicupdate/bug_10190.pl > deleted in HEAD and modified in Bug 10190: (QA follow-up): Fix removal of > tables. Version Bug 10190: (QA follow-up): Fix removal of tables of > installer/data/mysql/atomicupdate/bug_10190.pl left in tree. > error: Failed to merge in the changes. > Patch failed at 0001 Bug 10190: (QA follow-up): Fix removal of tables Apologies, that one's on me: it looks like I had left out 294be92e8e051570dbbfbb66f796e490dbecda27 when rebasing. I've amended the commit history to restore the commits order. -- 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/
