Merge pull request tenstorrent#24 from tenstorrent/vmilosevic/fix_bad…

…_merge Remove bad merge from test
buxiangqimingle233 · May 8, 2024 · 8f6dab2 · 8f6dab2
2 parents b657a26 + 9bbb0ef
commit 8f6dab2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pybuda/test/model_demos/high_prio/cnn/onnx/test_perceiverio.py b/pybuda/test/model_demos/high_prio/cnn/onnx/test_perceiverio.py
@@ -95,7 +95,3 @@ def test_perceiver_for_image_classification_onnx(test_device, model_name):
             pcc=0.96,
         ),
     )
-<<<<<<< HEAD
-
-=======
->>>>>>> 8a9956a14 (Add perceiver conv and learned model on gs)