Skip to content

Commit 84c8f92

Browse files
committed
fixed merge conflict
1 parent 319fd02 commit 84c8f92

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import com.google.api.client.util.BackOff;
2525
import com.google.cloud.Timestamp;
26-
import com.google.cloud.spanner.SpannerImpl.AbstractReadContext;
2726
import com.google.cloud.spanner.SpannerImpl.SessionImpl;
2827
import com.google.cloud.spanner.SpannerImpl.SessionTransaction;
2928
import com.google.cloud.spanner.spi.v1.SpannerRpc;

0 commit comments

Comments
 (0)