Skip to content

Commit

Permalink
merge conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
floreks committed Jul 17, 2024
1 parent 0bd5a13 commit b755853
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions internal/kstatus/watcher/watcher_reference.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,3 @@ func (ir *watcherReference) Restart() {
ir.started = false
ir.context = nil
}

// Restart ...
func (ir *watcherReference) Restart() {
ir.lock.Lock()
defer ir.lock.Unlock()

if !ir.started {
return
}

if ir.watcher != nil {
ir.watcher.Stop()
}

ir.started = false
ir.context = nil
}

0 comments on commit b755853

Please sign in to comment.