fix: merge conflict googleapis#2

anibadde · anibadde · commit 9ddb9115f0ff · 2020-07-28T18:24:35.000-05:00
diff --git a/tests_async/transport/async_compliance.py b/tests_async/transport/async_compliance.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright 2020 Google LLC
-=======
-# Copyright 2016 Google LLC
->>>>>>> async
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`# Copyright 2020 Google LLC`
`3`		`-=======`
`4`		`-# Copyright 2016 Google LLC`
`5`		`->>>>>>> async`
`6`	`2`	`#`
`7`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`8`	`4`	`# you may not use this file except in compliance with the License.`