Made indentation corrections in sorting.py

sorting.py

@@ -24,14 +24,14 @@ from heap import heap
 def mergeSort(lista, l, r):
 	if l < r:
 
-		# Same as (l+r)//2, but avoids overflow for
-		# large l and h
-		m = l+(r-l)//2
+	# Same as (l+r)//2, but avoids overflow for
+	# large l and h
+	m = l+(r-l)//2
 
-		# Sort first and second halves
-		mergeSort(lista, l, m)
-		mergeSort(lista, m+1, r)
-		merge(lista, l, m, r)
+	# Sort first and second halves
+	mergeSort(lista, l, m)
+	mergeSort(lista, m+1, r)
+	merge(lista, l, m, r)
 
 def heapSort(lista):
 
@@ -95,7 +95,3 @@ print ("MergeSort " + str(acumulaMerge/veces) + " segundos")
 print ("HeapSort " + str(acumulaHeap/veces) + " segundos")
 print ("QuickSort " + str(acumulaQuick/veces) + " segundos")
 print ("ShellSort " + str(acumulaShell/veces) + " segundos")
-<<<<<<< HEAD
-
-=======
->>>>>>> a2416a1f1584bddc699e3c6dfe5efdd25f2ac172