From 2dc3652bd398c5d98f81b08c4a39f69337100d67 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 14:16:27 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/test_ultranest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_ultranest.py b/tests/test_ultranest.py index 9afe01d3..db323bdb 100644 --- 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