Resolve merge conflict

Signed-off-by: Emmanuel Emonueje Ebenezer <eebenezer949@gmail.com>
jaegertracing · Jan 13, 2025 · 1febf80 · 1febf80
1 parent 9446b4a
commit 1febf80
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go
@@ -203,14 +203,7 @@ func (s *StorageIntegration) testArchiveTrace(t *testing.T) {
 		},
 	}
 	require.NoError(t, s.ArchiveTraceWriter.WriteTraces(context.Background(), v1adapter.V1TraceToOtelTrace(expectedTrace)))
-	expectedTrace := &model.Trace{
-		Spans: []*model.Span{
-			expectedSpan,
-		},
-	}
-	require.NoError(t, s.ArchiveTraceWriter.WriteTraces(context.Background(), v1adapter.V1TraceToOtelTrace(expectedTrace)))
 
-	var actualTrace *model.Trace
 	var actualTrace *model.Trace
 	found := s.waitForCondition(t, func(_ *testing.T) bool {
 		var err error