[Koha-bugs] [Bug 29008] Warning when checking Koha version in plugins

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |david at davidnind.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #18 from David Nind <david at davidnind.com> ---
The patch no longer applies 8-(.... Also, I'm not sure if this needs some more
work or if the questions from the discussions are resolved.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29008: Avoid warning when checking Koha version in plugins
Using index info to reconstruct a base tree...
M       Koha/Plugins/Base.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
M       plugins/plugins-home.pl
Falling back to patching base and 3-way merge...
Auto-merging plugins/plugins-home.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
Auto-merging Koha/Plugins/Base.pm
Applying: Bug 29008: Add unit test
Using index info to reconstruct a base tree...
M       t/db_dependent/Koha/Plugins/Plugins.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Plugins/Plugins.t
CONFLICT (content): Merge conflict in t/db_dependent/Koha/Plugins/Plugins.t
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29008: Add unit test

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