Rectifying error in previous force push

larryshamalama · larryshamalama · commit 7cd70938fe2a · 2021-11-11T11:44:08.000-05:00
diff --git a/pymc/tests/test_distributions_moments.py b/pymc/tests/test_distributions_moments.py
@@ -10,12 +10,9 @@
     Cauchy,
     ChiSquared,
     Constant,
-<<<<<<< HEAD
     DiscreteUniform,
     ExGaussian,
-=======
     Dirichlet,
->>>>>>> 39d15fa1 (Adding Dirichlet moment)
     Exponential,
     Flat,
     Gamma,
