From bc8050d8acb9cc162e03d3d93e1328feebcd4cb4 Mon Sep 17 00:00:00 2001
From: jiepeng <jiepengthegreat@126.com>
Date: Tue, 13 Sep 2022 18:18:22 +0800
Subject: [PATCH] typo

---
 pkg/gui/controllers/merge_conflicts_controller.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go
index 14ab748b1..40824099e 100644
--- a/pkg/gui/controllers/merge_conflicts_controller.go
+++ b/pkg/gui/controllers/merge_conflicts_controller.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"io/ioutil"
 	"os"
 
 	"github.com/jesseduffield/gocui"
@@ -193,7 +192,7 @@ func (self *MergeConflictsController) HandleUndo() error {
 
 	self.c.LogAction("Restoring file to previous state")
 	self.c.LogCommand("Undoing last conflict resolution", false)
-	if err := ioutil.os(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil {
+	if err := os.WriteFile(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil {
 		return err
 	}