diff options
| author | Dominik Kaiser | 2024-04-16 09:56:02 +0200 |
|---|---|---|
| committer | Dominik Kaiser | 2024-04-16 09:56:02 +0200 |
| commit | 49c0aa0bcda83ca590403a62b80e20b28d53c195 (patch) | |
| tree | 2936bc5ea6979db82cb1ccc6edeb1e13f1e8d319 /sorting.c | |
| parent | 94bcf24c78d02e9220fdb49fa14c70e5594afe40 (diff) | |
| download | push_swap-49c0aa0bcda83ca590403a62b80e20b28d53c195.tar.gz push_swap-49c0aa0bcda83ca590403a62b80e20b28d53c195.zip | |
Fix merge errors
Diffstat (limited to 'sorting.c')
| -rw-r--r-- | sorting.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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; } |
