diff options
Diffstat (limited to 'numpy/random/tests/test_direct.py')
| -rw-r--r-- | numpy/random/tests/test_direct.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/numpy/random/tests/test_direct.py b/numpy/random/tests/test_direct.py index 70a731861..d635d801b 100644 --- a/numpy/random/tests/test_direct.py +++ b/numpy/random/tests/test_direct.py @@ -6,13 +6,7 @@ from numpy.testing import (assert_equal, assert_allclose, assert_array_equal, assert_raises) import pytest -<<<<<<< HEAD from numpy.random import (Generator, MT19937, PCG64, Philox, RandomState) -======= -from numpy.random import (Generator, MT19937, PCG64, - Philox, Xoshiro256, Xoshiro512, RandomState, - SeedSequence) ->>>>>>> ENH: use SeedSequence to generate entropy for seeding from numpy.random.common import interface try: |