Merge conflict fix

microsoft · Jan 7, 2025 · 2688d6e · 2688d6e
1 parent 41aa177
commit 2688d6e
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/onnxscript/rewriter/onnxruntime/xformers/rotary_embedding_test.py b/onnxscript/rewriter/onnxruntime/xformers/rotary_embedding_test.py
@@ -5,21 +5,13 @@
 import unittest
 
 import onnxscript.optimizer
-<<<<<<< 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.rotary_embedding import fuse_rotary_embedding
 
 
 class TestRotaryEmbedding(unittest.TestCase):
     def test_smollm(self):
-<<<<<<< HEAD
         smollm_test = TestData()
-=======
-        smollm_test = _SmollmTestData()
->>>>>>> main
         model = smollm_test.get_onnx_model()
         onnxscript.optimizer.optimize(model)
         fuse_rotary_embedding(model)