fix: merge master

miraleung · web-flow · commit 26d71d28d085 · 2020-10-29T22:31:18.000-07:00
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)

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,6 @@ java_gapic_library(`
`112`	`112`	`"@com_google_googleapis//google/logging/v2:logging_java_proto",`
`113`	`113`	`],`
`114`	`114`	`)`
`115`		`-<<<<<<< HEAD`
`116`		`-=======`
`117`	`115`
`118`	`116`	`java_gapic_assembly_gradle_pkg(`
`119`	`117`	`name = "google-cloud-logging-v2-java",`
`@@ -124,4 +122,3 @@ java_gapic_assembly_gradle_pkg(`
`124`	`122`	`"@com_google_googleapis//google/logging/v2:logging_proto",`
`125`	`123`	`],`
`126`	`124`	`)`
`127`		`->>>>>>> 602e1df7 (fix: merge master)`