From 795350db3c18b56a13837dad993574ad36e65f85 Mon Sep 17 00:00:00 2001 From: daniel-dudt Date: Thu, 12 Dec 2024 09:56:20 -0700 Subject: [PATCH] remove duplicate line from merge conflict --- desc/utils.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/desc/utils.py b/desc/utils.py index 5f212f79a..d276c75e4 100644 --- a/desc/utils.py +++ b/desc/utils.py @@ -848,9 +848,6 @@ def atleast_2d_end(ary): return ary[:, jnp.newaxis] if ary.ndim == 1 else ary -PRINT_WIDTH = 60 # current longest name is BootstrapRedlConsistency with pre-text - - def dot(a, b, axis=-1): """Batched vector dot product.