contributor database

2018-02-20 22:43:55 +05:30
parent 385bf72a3e 7aed10cac3
commit 80bd8cd8de
2 changed files with 14 additions and 4 deletions
--- a/test/count_occurences/count_occurences.py
+++ b/test/count_occurences/count_occurences.py
@ -1,4 +1,14 @@
+<<<<<<< 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)
+        arr)
+=======
+from functools import reduce
+
+
+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