Skip to content
Snippets Groups Projects
Commit cc3be5a5 authored by David Hendriks's avatar David Hendriks
Browse files

fixed merge conflict

parents e93828da a6bc167a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
binarycpython/tests/test_distributions.py
+ 1
− 1
View file @ cc3be5a5
...@@ -216,13 +216,13 @@ class TestDistributions(unittest.TestCase): ...@@ -216,13 +216,13 @@ class TestDistributions(unittest.TestCase):
# for m=0.5 # for m=0.5
m = 0.5 m = 0.5
<<<<<<< HEAD
self.assertLess(np.abs(imf_chabrier2003(m)-0.581457346702825), self.tolerance, msg="Difference is bigger than the tolerance") self.assertLess(np.abs(imf_chabrier2003(m)-0.581457346702825), self.tolerance, msg="Difference is bigger than the tolerance")
# For m = 2 # For m = 2
m = 2 m = 2
self.assertLess(np.abs(imf_chabrier2003(m)-0.581457346702825), self.tolerance, msg="Difference is bigger than the tolerance") self.assertLess(np.abs(imf_chabrier2003(m)-0.581457346702825), self.tolerance, msg="Difference is bigger than the tolerance")
def test_duquennoy1991(self): def test_duquennoy1991(self):
""" """
Unittest for function duquennoy1991 Unittest for function duquennoy1991
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment