Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Emmanuel Emonueje Ebenezer <[email protected]>
  • Loading branch information
ekefan committed Jan 7, 2025
1 parent b7dc8ce commit aaab620
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plugin/storage/integration/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit aaab620

Please sign in to comment.