https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23824
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #9 from Magnus Enger <[email protected]> --- (In reply to Laura Escamilla from comment #8) > (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 Hm, it looks like there could be a problem because there were two patches. I have taken the liberty of obsoleting the first patch to test. Could you please try again now? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
