lib/core/facets/module/conflict.rb in facets-2.4.5 vs lib/core/facets/module/conflict.rb in facets-2.5.0

- old
+ new

@@ -13,11 +13,10 @@ # A.conflict?(B) #=> ["c"] # # # TODO: All instance methods, or just public? # - # CREDIT: Thomas Sawyer - # CREDIT: Robert Dober + # CREDIT: Thomas Sawyer, Robert Dober def conflict?(other) common_ancestor = (ancestors & other.ancestors).first c = [] c += (public_instance_methods(true) & other.public_instance_methods(true))