Remove erronously checked commented out code

scalapb · Mar 8, 2021 · 0fcda9c · 0fcda9c
1 parent 77077d2
commit 0fcda9c
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/scalapb/compiler/ProtobufGenerator.scala
@@ -726,16 +726,6 @@ class ProtobufGenerator(
     printer.addWithDelimiter(",")(constructorFields(message).map(_.fullString))
   }
 
-  /*
-  def generateMerge(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
-    val myFullScalaName = message.scalaType.fullNameWithMaybeRoot(message)
-    printer
-      .add(
-        s"def merge(`_message__`: $myFullScalaName, `_input__`: _root_.com.google.protobuf.CodedInputStream): $myFullScalaName = ??? // newBuilder(_message__).merge(_input__).result()"
-      )
-  }
-   */
-
   def generateToJavaProto(message: Descriptor)(printer: FunctionalPrinter): FunctionalPrinter = {
     val myFullScalaName = message.scalaType.fullName
     printer