From 879bc6f6dbcc8402defa8f99ad69727f8123c6de Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Fri, 14 May 2021 23:44:53 +0000
Subject: [PATCH] Get rid of merging tags

---
 src/google/protobuf/repeated_field_unittest.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/google/protobuf/repeated_field_unittest.cc b/src/google/protobuf/repeated_field_unittest.cc
index 3d0bfa6638..46b9e6db59 100644
--- a/src/google/protobuf/repeated_field_unittest.cc
+++ b/src/google/protobuf/repeated_field_unittest.cc
@@ -889,10 +889,6 @@ TEST(RepeatedPtrField, UnambiguousConstructor) {
 
   // Construction from string iterators for the unique string overload "g"
   // works.
-<<<<<<< HEAD
-=======
-  // std::string b[2] = {"abc", "xyz"};
->>>>>>> refs/tags/sync-piper
   // Disabling this for now, this is actually ambiguous with libstdc++.
   // std::string b[2] = {"abc", "xyz"};
   // EXPECT_TRUE(X::g({b, b + 2}));