Skip to content

Commit

Permalink
conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
  • Loading branch information
Manik2708 committed Jan 26, 2025
1 parent eb44eda commit 692eb0e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion plugin/storage/es/spanstore/service_operation.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/olivere/elastic"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/pkg/cache"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/es/spanstore/service_operation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/pkg/es/mocks"
"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/storage/spanstore"
Expand Down

0 comments on commit 692eb0e

Please sign in to comment.