merge conflict

kgashok · kgashok · commit 3f59acd1431e · 2020-08-27T17:00:43.000Z
diff --git a/pygorithm/sorting/merge_sort.py b/pygorithm/sorting/merge_sort.py
@@ -88,5 +88,4 @@ def get_code(iter=False):
     """
     if iter: 
         return inspect.getsource(sorti) + "\n"
-
     return inspect.getsource(sort) + "\n" + inspect.getsource(merge)
