Project import generated by Copybara.

PiperOrigin-RevId: 267280553

mediapipe/calculators/tensorflow/BUILD

@@ -188,8 +188,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
-<<<<<<< HEAD
-=======
     name = "tensorflow_session_from_frozen_graph_calculator_cc_proto",
     srcs = ["tensorflow_session_from_frozen_graph_calculator.proto"],
     cc_deps = [
@@ -201,7 +199,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
->>>>>>> Project import generated by Copybara.
     name = "tensorflow_session_from_saved_model_generator_cc_proto",
     srcs = ["tensorflow_session_from_saved_model_generator.proto"],
     cc_deps = ["//mediapipe/framework:packet_generator_cc_proto"],
@@ -459,8 +456,6 @@ cc_library(
 )
 
 cc_library(
-<<<<<<< HEAD
-=======
     name = "tensorflow_session_from_frozen_graph_calculator",
     srcs = ["tensorflow_session_from_frozen_graph_calculator.cc"],
     features = ["no_layering_check"],
@@ -490,7 +485,6 @@ cc_library(
 )
 
 cc_library(
->>>>>>> Project import generated by Copybara.
     name = "tensorflow_session_from_frozen_graph_generator",
     srcs = ["tensorflow_session_from_frozen_graph_generator.cc"],
     features = ["no_layering_check"],
@@ -784,8 +778,6 @@ cc_test(
 )
 
 cc_test(
-<<<<<<< HEAD
-=======
     name = "tensorflow_session_from_frozen_graph_calculator_test",
     srcs = ["tensorflow_session_from_frozen_graph_calculator_test.cc"],
     data = [":test_frozen_graph"],
@@ -816,7 +808,6 @@ cc_test(
 )
 
 cc_test(
->>>>>>> Project import generated by Copybara.
     name = "tensorflow_session_from_frozen_graph_generator_test",
     srcs = ["tensorflow_session_from_frozen_graph_generator_test.cc"],
     data = [":test_frozen_graph"],