From 3526c8340c5604696986f8d476547fd751b80cc1 Mon Sep 17 00:00:00 2001
From: mpetrun5 <matija.petrunic@gmail.com>
Date: Wed, 4 Oct 2023 14:04:43 +0200
Subject: [PATCH] Regenerate mocks

---
 mock/relayer.go | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mock/relayer.go b/mock/relayer.go
index ea62ee52..3e202412 100644
--- a/mock/relayer.go
+++ b/mock/relayer.go
@@ -113,7 +113,6 @@ func (mr *MockRelayedChainMockRecorder) DomainID() *gomock.Call {
 }
 
 // PollEvents mocks base method.
-<<<<<<< HEAD
 func (m *MockRelayedChain) PollEvents(ctx context.Context) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "PollEvents", ctx)
@@ -123,17 +122,6 @@ func (m *MockRelayedChain) PollEvents(ctx context.Context) {
 func (mr *MockRelayedChainMockRecorder) PollEvents(ctx any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PollEvents", reflect.TypeOf((*MockRelayedChain)(nil).PollEvents), ctx)
-=======
-func (m *MockRelayedChain) PollEvents(ctx context.Context, sysErr chan<- error) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "PollEvents", ctx, sysErr)
-}
-
-// PollEvents indicates an expected call of PollEvents.
-func (mr *MockRelayedChainMockRecorder) PollEvents(ctx, sysErr any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PollEvents", reflect.TypeOf((*MockRelayedChain)(nil).PollEvents), ctx, sysErr)
->>>>>>> main
 }
 
 // Write mocks base method.