From 84c8f927c6479ea3acc5aec4db5cb865afe97f8e Mon Sep 17 00:00:00 2001
From: Olav Loite <koloite@gmail.com>
Date: Sat, 6 Apr 2019 17:31:11 +0200
Subject: [PATCH] fixed merge conflict

---
 .../java/com/google/cloud/spanner/TransactionRunnerImpl.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
index f95d2374ef1b..de50fa083212 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
+++ b/google-cloud-clients/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;