[Koha-bugs] [Bug 22890] Add a chronological changelog

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

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

Victor Grousset/tuxayo <victor at tuxayo.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |victor at tuxayo.net

--- Comment #22 from Victor Grousset/tuxayo <victor at tuxayo.net> ---
Patch doesn't apply.

<<<<<<< HEAD
use File::Slurp;
use List::MoreUtils qw/ any /;
||||||| constructed merge base
use List::MoreUtils qw/ any /;
=======
use List::MoreUtils qw/ any firstval /;
>>>>>>> Bug 22890: Add CHANGELOG.md and display it in About page


What the 3 parts conflict shows is that:
- File::Slurp was added in master. (compare )
- this bug add firstval from List::MoreUtils

So it's easy to solve. Just keep Slurp and long version of List::MoreUtils

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