http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11944
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #59 from Paola Rossi <[email protected]> --- Today I've installed master 3.15.00.027 I try to apply the patches. At the 6-th patch there a conflict, perhaps due to the rebasing: Applying: Bug 11944: use CGI( -utf8 ) everywhere Using index info to reconstruct a base tree... <stdin>:2009: trailing whitespace. use CGI qw ( -utf8 ); warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging tools/koha-news.pl CONFLICT (content): Merge conflict in tools/koha-news.pl Auto-merging opac/opac-main.pl CONFLICT (content): Merge conflict in opac/opac-main.pl Auto-merging mainpage.pl CONFLICT (content): Merge conflict in mainpage.pl Failed to merge in the changes. Patch failed at 0001 Bug 11944: use CGI( -utf8 ) everywhere ------------------ So I pass the patch to "Patch doesn't apply" status. -- 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/
