summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kaiser2024-04-16 09:56:02 +0200
committerDominik Kaiser2024-04-16 09:56:02 +0200
commit49c0aa0bcda83ca590403a62b80e20b28d53c195 (patch)
tree2936bc5ea6979db82cb1ccc6edeb1e13f1e8d319
parent94bcf24c78d02e9220fdb49fa14c70e5594afe40 (diff)
downloadpush_swap-49c0aa0bcda83ca590403a62b80e20b28d53c195.tar.gz
push_swap-49c0aa0bcda83ca590403a62b80e20b28d53c195.zip
Fix merge errors
-rw-r--r--sorting.c5
1 files changed, 2 insertions, 3 deletions
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;
}