fix: extra merge conflict

sinaptik-ai · Feb 5, 2025 · 7210170 · 7210170
1 parent b7ceab4
commit 7210170
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/tests/unit_tests/smart_datalake/test_smart_datalake.py b/tests/unit_tests/smart_datalake/test_smart_datalake.py
@@ -44,8 +44,6 @@ def test_enable_cache(sample_dataframes):
     # Test with cache disabled
     mock_config.enable_cache = False
     assert smart_datalake.enable_cache is False
-<<<<<<< HEAD
-=======
 
 
 def test_enable_cache_setter(sample_dataframes):
@@ -71,4 +69,3 @@ def test_enable_cache_setter(sample_dataframes):
     smart_datalake.enable_cache = False
     assert mock_agent.context.config.enable_cache is False
     assert smart_datalake._cache is None
->>>>>>> 98ea589882e8fa26e8972c28bfac7b282a675b75