fixed merge conflict

googleapis · Apr 6, 2019 · 84c8f92 · 84c8f92
1 parent 319fd02
commit 84c8f92
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/...ts/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/...ts/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -23,7 +23,6 @@
 
 import com.google.api.client.util.BackOff;
 import com.google.cloud.Timestamp;
-import com.google.cloud.spanner.SpannerImpl.AbstractReadContext;
 import com.google.cloud.spanner.SpannerImpl.SessionImpl;
 import com.google.cloud.spanner.SpannerImpl.SessionTransaction;
 import com.google.cloud.spanner.spi.v1.SpannerRpc;