Fix unsaved merge resolution

BUILD.bazel

@@ -5,10 +5,6 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library", "c
 load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
 load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
 load("@rules_java//java:defs.bzl", "java_binary", "java_lite_proto_library", "java_proto_library")
-<<<<<<< HEAD
-load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
-load(":protobuf.bzl", "py_proto_library")
-=======
 load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS", "PROTOC_LINK_OPTS")
 load(
     ":protobuf.bzl",
@@ -18,7 +14,6 @@ load(
     "internal_protobuf_py_tests",
     "py_proto_library",
 )
->>>>>>> upstream/21.x
 
 licenses(["notice"])
 

Protobuf.podspec

@@ -5,11 +5,7 @@
 # dependent projects use the :git notation to refer to the library.
 Pod::Spec.new do |s|
   s.name     = 'Protobuf'
-<<<<<<< HEAD
-  s.version  = '3.21.0-rc1'
-=======
   s.version  = '3.21.1'
->>>>>>> upstream/21.x
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = 'BSD-3-Clause'

src/google/protobuf/compiler/php/php_generator.cc

@@ -408,7 +408,6 @@ std::string GeneratedClassFileName(const DescriptorType* desc,
 }
 
 template <typename DescriptorType>
-<<<<<<< HEAD
 std::string LegacyReadOnlyGeneratedClassFileName(const DescriptorType* desc,
                                    const Options& options) {
   std::string php_namespace = RootPhpNamespace(desc, options);
@@ -416,18 +415,6 @@ std::string LegacyReadOnlyGeneratedClassFileName(const DescriptorType* desc,
     return php_namespace + "/" + desc->name() + ".php";
   }
   return desc->name() + ".php";
-=======
-std::string LegacyGeneratedClassFileName(const DescriptorType* desc,
-                                         const Options& options) {
-  std::string result = LegacyFullClassName(desc, options);
-
-  for (int i = 0; i < result.size(); i++) {
-    if (result[i] == '\\') {
-      result[i] = '/';
-    }
-  }
-  return result + ".php";
->>>>>>> upstream/21.x
 }
 
 std::string GeneratedServiceFileName(const ServiceDescriptor* service,
@@ -1276,17 +1263,10 @@ void GenerateMetadataFile(const FileDescriptor* file, const Options& options,
 }
 
 template <typename DescriptorType>
-<<<<<<< HEAD
 void LegacyReadOnlyGenerateClassFile(const FileDescriptor* file,
                              const DescriptorType* desc, const Options& options,
                              GeneratorContext* generator_context) {
   std::string filename = LegacyReadOnlyGeneratedClassFileName(desc, options);
-=======
-void LegacyGenerateClassFile(const FileDescriptor* file,
-                             const DescriptorType* desc, const Options& options,
-                             GeneratorContext* generator_context) {
-  std::string filename = LegacyGeneratedClassFileName(desc, options);
->>>>>>> upstream/21.x
   std::unique_ptr<io::ZeroCopyOutputStream> output(
       generator_context->Open(filename));
   io::Printer printer(output.get(), '^');
@@ -1300,30 +1280,11 @@ void LegacyGenerateClassFile(const FileDescriptor* file,
         "name", php_namespace);
   }
   std::string newname = FullClassName(desc, options);
-<<<<<<< HEAD
   printer.Print("class_exists(^new^::class);\n",
       "new", GeneratedClassNameImpl(desc));
   printer.Print("@trigger_error(__NAMESPACE__ . '\\^old^ is deprecated and will be removed in "
       "the next major release. Use ^fullname^ instead', E_USER_DEPRECATED);\n\n",
       "old", desc->name(),
-=======
-  printer.Print("if (false) {\n");
-  Indent(&printer);
-  printer.Print("/**\n");
-  printer.Print(" * This class is deprecated. Use ^new^ instead.\n",
-      "new", newname);
-  printer.Print(" * @deprecated\n");
-  printer.Print(" */\n");
-  printer.Print("class ^old^ {}\n",
-      "old", LegacyGeneratedClassName(desc));
-  Outdent(&printer);
-  printer.Print("}\n");
-  printer.Print("class_exists(^new^::class);\n",
-      "new", GeneratedClassNameImpl(desc));
-  printer.Print("@trigger_error('^old^ is deprecated and will be removed in "
-      "the next major release. Use ^fullname^ instead', E_USER_DEPRECATED);\n\n",
-      "old", LegacyFullClassName(desc, options),
->>>>>>> upstream/21.x
       "fullname", newname);
 }
 

version.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
     "main": {
         "protoc_version": "21-dev",
         "lts": false,
@@ -13,21 +12,6 @@
             "php": "3.21-dev",
             "python": "4.21-dev",
             "ruby": "3.21-dev"
-=======
-    "21.x": {
-        "protoc_version": "21.2-dev",
-        "lts": false,
-        "date": "2022-05-27",
-        "languages": {
-            "cpp": "3.21.2-dev",
-            "csharp": "3.21.2-dev",
-            "java": "3.21.2-dev",
-            "javascript": "3.21.2-dev",
-            "objectivec": "3.21.2-dev",
-            "php": "3.21.2-dev",
-            "python": "4.21.2-dev",
-            "ruby": "3.21.2-dev"
->>>>>>> upstream/21.x
         }
     }
 }