Fix merge conflict

microsoft · Jan 7, 2025 · 41aa177 · 41aa177
1 parent e0f29e2
commit 41aa177
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/onnxscript/rewriter/onnxruntime/xformers/cos_sin_cache_test.py b/onnxscript/rewriter/onnxruntime/xformers/cos_sin_cache_test.py
@@ -6,21 +6,13 @@
 
 import onnxscript.optimizer
 from onnxscript.rewriter.onnxruntime.xformers import fuse_cos_sin_cache, fuse_rotary_embedding
-<<<<<<< HEAD
 from onnxscript.rewriter.onnxruntime.xformers._smollm_1 import TestData
-=======
-from onnxscript.rewriter.onnxruntime.xformers._smollm_1layer import _SmollmTestData
->>>>>>> main
 from onnxscript.rewriter.onnxruntime.xformers._test_utils import assert_allclose, ort_run
 
 
 class TestCosSinCacheTransform(unittest.TestCase):
     def test_smollm(self):
-<<<<<<< HEAD
         smollm_test = TestData()
-=======
-        smollm_test = _SmollmTestData()
->>>>>>> main
         model = smollm_test.get_onnx_model()
         onnxscript.optimizer.optimize(model)
         inputs = smollm_test.get_ort_inputs()