fix bad merge

galaxyproject · May 27, 2022 · 352aaf0 · 352aaf0
1 parent dfc7683
commit 352aaf0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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):