[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
21cmfast · Sep 1, 2023 · 2dc3652 · 2dc3652
1 parent 2765533
commit 2dc3652
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/tests/test_ultranest.py b/tests/test_ultranest.py
@@ -1,10 +1,13 @@
 import pytest
 
 import numpy as np
+
 <<<<<<< HEAD
 from py21cmfast._utils import ParameterError
+
 =======
 from py21cmfast.utils import ParameterError
+
 >>>>>>> 8f37db0abbf256c3f878abf980a2e7f171bfd3e6
 
 import py21cmmc as mcmc