http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12395
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #28 from Paola Rossi <[email protected]> --- I've tried to apply the patch against master 3.19.00.010 head 13675 Applying: Bug 12395: Save order line's creator Using index info to reconstruct a base tree... <stdin>:234: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Failed to merge in the changes. Patch failed at 0001 Bug 12395: Save order line's creator So I pass the patch to "Patch doesn't apply" status. NB. All the first 3 patches relate to updatedatabase. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
