Fix merge conflict

2018-02-21 03:06:09 +01:00
parent 7fedd75301
commit 5ce230793c
1 changed files with 0 additions and 7 deletions
--- a/test/count_occurences/count_occurences.py
+++ b/test/count_occurences/count_occurences.py
@ -1,9 +1,3 @@
-<<<<<<< HEAD
-def count_occurences(arr, val):
-    return reduce(
-        (lambda x, y: x + 1 if y == val and type(y) == type(val) else x + 0),
-        arr)
-=======
 from functools import reduce


@ -11,4 +5,3 @@ def count_occurences(arr, val):
    return reduce(
        (lambda x, y: x + 1 if y == val and type(y) == type(val) else x + 0),
        arr)
->>>>>>> 7aed10cac32bcdd889b6b6d762cb0024dc1c73be