[Koha-bugs] [Bug 27432] Add report run to action logs

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27432

--- Comment #14 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I've tried to apply patches 2 3 4 as attached, but I still have a conflict that
needs to be solved by the dev:

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 27432: Add report run to action logs
Applying: Bug 27432: (QA follow-up) fix if report_id
Applying: Bug 27432: Update ReportsLog system preference description
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref).
error: could not build fake ancestor
Patch failed at 0001 Bug 27432: Update ReportsLog system preference description
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-27432-Update-ReportsLog-system-preference-desc-Ygc9OB.patch

-- 
You are receiving this mail because:
You are watching all bug changes.