http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13040
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply --- Comment #6 from Paola Rossi <[email protected]> --- I've tried to apply the patch against master 3.19.00.002 Applying: Bug 13040 - multiple branch selections in exporter Using index info to reconstruct a base tree... <stdin>:28: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging tools/export.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css Failed to merge in the changes. Patch failed at 0001 Bug 13040 - multiple branch selections in exporter 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/
