[Koha-bugs] [Bug 19994] use Modern::Perl in Authorities perl scripts

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

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

Aleisha Amohia <aleisha at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #4 from Aleisha Amohia <aleisha at catalyst.net.nz> ---
Patch needs rebasing:

Applying: Bug 19994: use Modern::Perl in Authorities perl scripts
Using index info to reconstruct a base tree...
M       authorities/auth_finder.pl
M       authorities/authorities-home.pl
A       authorities/authorities-list.pl
M       authorities/authorities.pl
M       authorities/blinddetail-biblio-search.pl
M       authorities/detail.pl
M       authorities/merge.pl
Falling back to patching base and 3-way merge...
Auto-merging authorities/merge.pl
Auto-merging authorities/detail.pl
Auto-merging authorities/blinddetail-biblio-search.pl
Auto-merging authorities/authorities.pl
CONFLICT (modify/delete): authorities/authorities-list.pl deleted in HEAD and
modified in Bug 19994: use Modern::Perl in Authorities perl scripts. Version
Bug 19994: use Modern::Perl in Authorities perl scripts of
authorities/authorities-list.pl left in tree.
Auto-merging authorities/authorities-home.pl
Auto-merging authorities/auth_finder.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 19994: use Modern::Perl in Authorities perl scripts

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