conflicts resolved

Signed-off-by: Manik2708 <[email protected]>
jaegertracing · Dec 28, 2024 · 1cba60a · 1cba60a
1 parent 6570013
commit 1cba60a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 (