Remove usesless comment left-over from merge conflict resolution

slackhq · Jun 6, 2023 · c322ded · c322ded
1 parent bb7e6fc
commit c322ded
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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))
 			}
 		})
 	}