From: Dominik Kaiser <dominik@dominik-XPS.fritz.box>
Date: Tue, 16 Apr 2024 07:56:02 +0000 (+0200)
Subject: Fix merge errors
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=49c0aa0bcda83ca590403a62b80e20b28d53c195;p=42%2Fpush_swap.git

Fix merge errors
---

diff --git a/sorting.c b/sorting.c
index 7006393..feae530 100644
--- a/sorting.c
+++ b/sorting.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/13 15:04:19 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/04/16 09:27:53 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/04/16 09:55:31 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -54,7 +54,6 @@ void stack_sort(t_psdata *data)
         if (data->a->stack[pivot_idx] == pivot)
             pivot_idx--;
         if (pivot_idx < 0)
-            pivot_idx = sdata->a->size - 1;
+            pivot_idx = data->a->size - 1;
     }
-    return cmds;
 }