From a43bc9a296f279dce19a300d5ed84deb52ecfd43 Mon Sep 17 00:00:00 2001 From: Emmanuel Emonueje Ebenezer Date: Mon, 6 Jan 2025 02:13:10 +0100 Subject: [PATCH] Resolve merge conflict Signed-off-by: Emmanuel Emonueje Ebenezer --- plugin/storage/integration/integration.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go index b20adf252675..9823c489f438 100644 --- a/plugin/storage/integration/integration.go +++ b/plugin/storage/integration/integration.go @@ -43,8 +43,8 @@ var fixtures embed.FS // Some implementations may declare multiple tests, with different settings, // and RunAll() under different conditions. type StorageIntegration struct { - TraceWriter tracestore.Writer - TraceReader tracestore.Reader + TraceWriter tracestore.Writer + TraceReader tracestore.Reader ArchiveTraceReader tracestore.Reader ArchiveTraceWriter tracestore.Writer DependencyWriter dependencystore.Writer