https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22890
Victor Grousset/tuxayo <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #22 from Victor Grousset/tuxayo <[email protected]> --- 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. _______________________________________________ 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/
