fix: merge master

googleapis · Oct 30, 2020 · ff8cd7e · ff8cd7e
1 parent c57b166
commit ff8cd7e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
@@ -240,8 +240,6 @@ private static Map<String, Message> parseMessages(
       }
     }
     String pakkage = TypeParser.getPackage(messageDescriptor.getFile());
-    List<String> fieldNames =
-        messageDescriptor.getFields().stream().map(f -> f.getName()).collect(Collectors.toList());
     messages.put(
         messageName,
         Message.builder()

diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
@@ -112,8 +112,6 @@ java_gapic_library(
         "@com_google_googleapis//google/logging/v2:logging_java_proto",
     ],
 )
-<<<<<<< HEAD
-=======
 
 java_gapic_assembly_gradle_pkg(
     name = "google-cloud-logging-v2-java",
@@ -124,4 +122,3 @@ java_gapic_assembly_gradle_pkg(
         "@com_google_googleapis//google/logging/v2:logging_proto",
     ],
 )
->>>>>>> 602e1df7 (fix: merge master)