From b17d345795221947b32c286d7a5df3358ac80c3c Mon Sep 17 00:00:00 2001
From: Manik2708 <mehtamanik96@gmail.com>
Date: Sat, 25 Jan 2025 13:43:09 +0530
Subject: [PATCH] conflicts

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>
---
 storage_v2/depstore/mocks/Writer.go | 52 -----------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 storage_v2/depstore/mocks/Writer.go

diff --git a/storage_v2/depstore/mocks/Writer.go b/storage_v2/depstore/mocks/Writer.go
deleted file mode 100644
index 0c3680c4059..00000000000
--- a/storage_v2/depstore/mocks/Writer.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) The Jaeger Authors.
-// SPDX-License-Identifier: Apache-2.0
-//
-// Run 'make generate-mocks' to regenerate.
-
-// Code generated by mockery. DO NOT EDIT.
-
-package mocks
-
-import (
-	model "github.com/jaegertracing/jaeger/model"
-	mock "github.com/stretchr/testify/mock"
-
-	time "time"
-)
-
-// Writer is an autogenerated mock type for the Writer type
-type Writer struct {
-	mock.Mock
-}
-
-// WriteDependencies provides a mock function with given fields: ts, dependencies
-func (_m *Writer) WriteDependencies(ts time.Time, dependencies []model.DependencyLink) error {
-	ret := _m.Called(ts, dependencies)
-
-	if len(ret) == 0 {
-		panic("no return value specified for WriteDependencies")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(time.Time, []model.DependencyLink) error); ok {
-		r0 = rf(ts, dependencies)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// NewWriter creates a new instance of Writer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewWriter(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *Writer {
-	mock := &Writer{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}