Update test_converter.py

lizexu123 · Jul 29, 2024 · ed5d356 · ed5d356
1 parent e3b708b
commit ed5d356
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/python/paddle/pp_tensorrt/test_converter.py b/python/paddle/pp_tensorrt/test_converter.py
@@ -251,11 +251,6 @@ def test_paddle_to_tensorrt_conversion_idg():
 
 if __name__ == "__main__":
     # test_paddle_to_tensorrt_conversion_dummy()
-<<<<<<< HEAD
-    test_paddle_to_tensorrt_conversion_bert()
-    # test_paddle_to_tensorrt_conversion_r50()
-=======
     # test_paddle_to_tensorrt_conversion_bert()
     # test_paddle_to_tensorrt_conversion_r50()
     test_paddle_to_tensorrt_conversion_idg()
->>>>>>> 7392b66b1824fedce71557ebf5547359f232cc66