diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2019-06-25 17:20:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 17:20:44 -0600 |
| commit | 0487fb02618a81c9a1b1e7fd5a294eb337e6ba5b (patch) | |
| tree | 883387966416aefdde6c54d79d2fe52d2a4bf714 /numpy/random/tests/test_direct.py | |
| parent | c69f90c39b7e400e2dc620fb4cc0fb4962f0a5e4 (diff) | |
| download | numpy-0487fb02618a81c9a1b1e7fd5a294eb337e6ba5b.tar.gz | |
MAINT: Fix bad merge.
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: |