From 5ce230793c4a1fcebb4ba87147065f9e66c52e43 Mon Sep 17 00:00:00 2001 From: cclauss Date: Wed, 21 Feb 2018 03:06:09 +0100 Subject: [PATCH] Fix merge conflict --- test/count_occurences/count_occurences.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/count_occurences/count_occurences.py b/test/count_occurences/count_occurences.py index 7fa11a338..5295e644a 100644 --- 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