From ff8cd7e35a0cfb0c9a1e3eb6f0076570dcc07157 Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@google.com>
Date: Thu, 29 Oct 2020 22:31:53 -0700
Subject: [PATCH] fix: merge master

---
 .../com/google/api/generator/gapic/protoparser/Parser.java     | 2 --
 test/integration/BUILD.bazel                                   | 3 ---
 2 files changed, 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
index c16246a70e..2b58e07f51 100644
--- 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
index b5040e258d..48f6c2ddbb 100644
--- 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)