Pull merge

zdelrosario · Aug 3, 2023 · 61588d4 · 61588d4
2 parents 81b3263 + 985ad80
commit 61588d4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/grama/marginals.py b/grama/marginals.py
@@ -116,7 +116,10 @@
     weibull_max,
     wrapcauchy,
 )
+<<<<<<< HEAD
 
+=======
+>>>>>>> 985ad80dce69e01a5efeb48a59a805841c340e3a
 
 ## Scipy metadata
 valid_dist = {