From c322ded8bc14935f9400bc1c8514d2e7bd00ce98 Mon Sep 17 00:00:00 2001
From: "Eduardo J. Ortega U" <5791035+ejortegau@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:38:07 +0200
Subject: [PATCH] Remove usesless comment left-over from merge conflict
 resolution

---
 go/vt/vttablet/tabletserver/query_executor_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/vt/vttablet/tabletserver/query_executor_test.go b/go/vt/vttablet/tabletserver/query_executor_test.go
index 378d140fb49..17c733dd678 100644
--- a/go/vt/vttablet/tabletserver/query_executor_test.go
+++ b/go/vt/vttablet/tabletserver/query_executor_test.go
@@ -355,7 +355,6 @@ func TestQueryExecutorPlans(t *testing.T) {
 				assert.Equal(t, want, qre.logStats.RewrittenSQL(), "in tx: %v", tcase.input)
 			} else {
 				assert.True(t, vterrors.Equals(err, tcase.errorWant))
-				//>>>>>>> 3faefa20fa (TxThrottler support for transactions outside BEGIN/COMMIT (#13040))
 			}
 		})
 	}