[Koha-bugs] [Bug 13040] Improve exporter to allow multiple branch selections
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Tue Dec 23 16:49:49 CET 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13040
Paola Rossi <paola.rossi at cineca.it> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Failed QA |Patch doesn't apply
--- Comment #6 from Paola Rossi <paola.rossi at cineca.it> ---
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.
More information about the Koha-bugs
mailing list