From b29753b131d627fc5416b43642ffec88a9e2bc18 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Wed, 24 Feb 2021 14:35:18 +0800 Subject: [PATCH] update --- src/util/_impl/_sort_impl.scad | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/util/_impl/_sort_impl.scad b/src/util/_impl/_sort_impl.scad index 84c03eab..d62c5ee8 100644 --- a/src/util/_impl/_sort_impl.scad +++ b/src/util/_impl/_sort_impl.scad @@ -35,8 +35,4 @@ function _sort_by_cmp(lt, cmp) = before = [for(j = 1; j < leng; j = j + 1) if(cmp(lt[j], pivot) < 0) lt[j]], after = [for(j = 1; j < leng; j = j + 1) if(cmp(lt[j], pivot) >= 0) lt[j]] ) -<<<<<<< HEAD concat(_sort_by_cmp(before, cmp), [pivot], _sort_by_cmp(after, cmp)); -======= - concat(_sort_by_cmp(before, cmp), [pivot], _sort_by_cmp(after, cmp)); ->>>>>>> 04a802bfb911930423c0e24af5370bc91b96e8f5