https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23824
Laura Escamilla <laura.escami...@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |Laura.escamilla@bywatersolu | |tions.com Status|Needs Signoff |Patch doesn't apply --- Comment #8 from Laura Escamilla <laura.escami...@bywatersolutions.com> --- (In reply to Magnus Enger from comment #7) > I have taken the liberty of making a patch more in line with Katrin's > suggestions. Patch did not apply. CONFLICT (content): Merge conflict in reports/guided_reports.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 23824: Add a Save and Run button to exports [33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/