fix merge conflict

mpeddada1 · mpeddada1 · commit a942e25a62d8 · 2025-10-29T15:37:41.000Z
diff --git a/google/cloud/bigtable/internal/data_connection_impl_test.cc b/google/cloud/bigtable/internal/data_connection_impl_test.cc
@@ -2769,7 +2769,6 @@ TEST_F(DataConnectionTest, PrepareQueryPermanentError) {
                                  "the-instance"),
       bigtable::SqlStatement("SELECT * FROM the-table")});
   EXPECT_THAT(result, StatusIs(StatusCode::kPermissionDenied));
-<<<<<<< HEAD
 }
 
 TEST_F(DataConnectionTest, AsyncPrepareQuerySuccess) {
@@ -2813,8 +2812,6 @@ TEST_F(DataConnectionTest, AsyncPrepareQueryPermanentError) {
   auto future = conn->AsyncPrepareQuery(params);
   auto result = future.get();
   EXPECT_THAT(result, StatusIs(StatusCode::kPermissionDenied));
-=======
->>>>>>> 717cc7b290ff2536005f702c921da601b400f96a
 }
 
 }  // namespace

Original file line number	Diff line number	Diff line change
`@@ -2769,7 +2769,6 @@ TEST_F(DataConnectionTest, PrepareQueryPermanentError) {`
`2769`	`2769`	`"the-instance"),`
`2770`	`2770`	`bigtable::SqlStatement("SELECT * FROM the-table")});`
`2771`	`2771`	`EXPECT_THAT(result, StatusIs(StatusCode::kPermissionDenied));`
`2772`		`-<<<<<<< HEAD`
`2773`	`2772`	`}`
`2774`	`2773`
`2775`	`2774`	`TEST_F(DataConnectionTest, AsyncPrepareQuerySuccess) {`
`@@ -2813,8 +2812,6 @@ TEST_F(DataConnectionTest, AsyncPrepareQueryPermanentError) {`
`2813`	`2812`	`auto future = conn->AsyncPrepareQuery(params);`
`2814`	`2813`	`auto result = future.get();`
`2815`	`2814`	`EXPECT_THAT(result, StatusIs(StatusCode::kPermissionDenied));`
`2816`		`-=======`
`2817`		`->>>>>>> 717cc7b290ff2536005f702c921da601b400f96a`
`2818`	`2815`	`}`
`2819`	`2816`
`2820`	`2817`	`} // namespace`