Projects >> commons-lang >>9604c853069562e8c4219ae27eaa4b2bad59eabc

Chunk
Conflicting content 
     * StringUtils.containsAny("", *)              = false
     * StringUtils.containsAny(*, null)            = false
     * StringUtils.containsAny(*, [])              = false
<<<<<<< HEAD
     * StringUtils.containsAny("abcd", "ab", "cd") = false
     * StringUtils.containsAny("abcd", "ab", null) = false
=======
     * StringUtils.containsAny("abcd", "ab", "cd") = true
>>>>>>> 1182950a8860efcb59e2fc09f89ab7c0400c45ba
     * StringUtils.containsAny("abc", "d", "abc")  = true
     *
*
Solution content 
     * StringUtils.containsAny("", *)              = false
     * StringUtils.containsAny(*, null)            = false
     * StringUtils.containsAny(*, [])              = false
     * StringUtils.containsAny("abcd", "ab", null) = false
     * StringUtils.containsAny("abcd", "ab", "cd") = true
     * StringUtils.containsAny("abc", "d", "abc")  = true
     *
*
File
StringUtils.java
Developer's decision
Combination
Kind of conflict
Comment