From 352aaf024f6402580ad96631823beb617b0886c6 Mon Sep 17 00:00:00 2001 From: Simon Bray Date: Fri, 27 May 2022 12:37:54 +0200 Subject: [PATCH] fix bad merge --- tests/test_galaxy_config.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/test_galaxy_config.py b/tests/test_galaxy_config.py index 505300f75..c8cf7442f 100644 --- a/tests/test_galaxy_config.py +++ b/tests/test_galaxy_config.py @@ -48,13 +48,8 @@ def test_refgenie_config_version(): version_path = os.path.join(galaxy_lib_path, "version.py") with open(version_path, "w") as version_fh: version_fh.write('VERSION_MAJOR = "21.05"') -<<<<<<< HEAD - refgenie_config = get_refgenie_config(galaxy_root=tdc.temp_directory, refgenie_dir='/') - assert yaml.load(refgenie_config, Loader=yaml.SafeLoader)['config_version'] == 0.3 -======= refgenie_config = get_refgenie_config(galaxy_root=tdc.temp_directory, refgenie_dir="/") assert yaml.load(refgenie_config, Loader=yaml.SafeLoader)["config_version"] == 0.3 ->>>>>>> upstream/master def _assert_property_is(config, prop, value):