fix conflict

Signed-off-by: nolouch <[email protected]>
tikv · May 24, 2023 · fd87b5a · fd87b5a
1 parent 0854d40
commit fd87b5a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 441 deletions.
diff --git a/pkg/member/participant.go b/pkg/member/participant.go
diff --git a/server/member/member.go b/server/member/member.go
@@ -148,7 +148,7 @@ func (m *Member) GetLeadership() *election.Leadership {
 }
 
 // GetLastLeaderUpdatedTime returns the last time when the leader is updated.
-func (m *EmbeddedEtcdMember) GetLastLeaderUpdatedTime() time.Time {
+func (m *Member) GetLastLeaderUpdatedTime() time.Time {
 	lastLeaderUpdatedTime := m.lastLeaderUpdatedTime.Load()
 	if lastLeaderUpdatedTime == nil {
 		return time.Time{}