fix git conflict characters left over from local resolution via rebase

Author: ilaflott

fremorizer/tests/test_cmor_finder_make_simple_varlist.py

@@ -178,14 +178,10 @@ def test_make_simple_varlist_mip_table_filter(tmp_path):
     result = make_simple_varlist(str(tmp_path), None, json_mip_table=str(mip_table))
 
     assert result is not None
-<<<<<<< HEAD
-    assert 'sos' in result
-    assert 'notinmip' not in result
-=======
     assert result.get("sos") == "sos", "MIP variable should be self-mapped"
     assert "notinmip" in result, "non-MIP variable should be included"
     assert result["notinmip"] == '', "non-MIP variable should have empty string value"
->>>>>>> db3c60b (fix: resolve omission tracking clash and propagate new varlist semantics to fremor varlist)
+
 
 
 # ---- no files matching search pattern ----