From 1cba60a35d6be2f31eb711c5ba36866a422465cc Mon Sep 17 00:00:00 2001 From: Manik2708 Date: Sat, 28 Dec 2024 21:45:55 +0530 Subject: [PATCH] conflicts resolved Signed-off-by: Manik2708 --- plugin/storage/es/spanstore/service_operation.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/storage/es/spanstore/service_operation.go b/plugin/storage/es/spanstore/service_operation.go index 2c0ae1596e13..ec20fcac771c 100644 --- a/plugin/storage/es/spanstore/service_operation.go +++ b/plugin/storage/es/spanstore/service_operation.go @@ -19,7 +19,8 @@ import ( "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/pkg/cache" "github.com/jaegertracing/jaeger/pkg/es" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel" + "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" + "github.com/jaegertracing/jaeger/storage/spanstore" ) const (