Update tests

JaGeo · May 2, 2024 · f22d729 · f22d729
1 parent 4eb6182
commit f22d729
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/tests/cohp/test_describe.py b/tests/cohp/test_describe.py
@@ -436,17 +436,10 @@ def test_warnings(self):
                 potcar_symbols=["Be_sv", "Te"],
                 bva_comp=True,
             )
-<<<<<<< HEAD
-        assert ("Consider rerunning the calc with the minimum basis as well. "
-                "Choosing is larger basis set is recommended if you see a significant "
-                "improvement of the charge spilling and material has non-zero band gap." == str(w3[0].message))
-=======
         assert (
             str(w3[0].message)
             == "Consider rerunning the calc with the minimum basis as well. Choosing is larger basis set is recommended if you see a significant improvement of the charge spilling and material has non-zero band gap."
         )
->>>>>>> 5cc7533a561157df818a3ac7f819046d1a07001e
-
         calc_des3 = Description.get_calc_quality_description(calc_quality_warnings3)
 
         assert calc_des3 == [