mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-11-27 22:38:09 +02:00
Remove return value of RenderToMainViews and some related functions
This commit is contained in:
@@ -100,7 +100,7 @@ func (self *MergeConflictsHelper) context() *context.MergeConflictsContext {
|
||||
return self.c.Contexts().MergeConflicts
|
||||
}
|
||||
|
||||
func (self *MergeConflictsHelper) Render() error {
|
||||
func (self *MergeConflictsHelper) Render() {
|
||||
content := self.context().GetContentToRender()
|
||||
|
||||
var task types.UpdateTask
|
||||
@@ -111,7 +111,7 @@ func (self *MergeConflictsHelper) Render() error {
|
||||
task = types.NewRenderStringWithScrollTask(content, 0, originY)
|
||||
}
|
||||
|
||||
return self.c.RenderToMainViews(types.RefreshMainOpts{
|
||||
self.c.RenderToMainViews(types.RefreshMainOpts{
|
||||
Pair: self.c.MainViewPairs().MergeConflicts,
|
||||
Main: &types.ViewUpdateOpts{
|
||||
Task: task,
|
||||
|
||||
Reference in New Issue
Block a user