taigrr/mg
1
0
Fork 0
mirror of https://github.com/taigrr/mg.git synced 2026-04-02 03:28:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Tai Groot
2024-02-02 13:29:27 -08:00
parent a889092b0d
commit 567ab899e0
3 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
parse/mgconf.go
View File

@@ -3,7 +3,6 @@ package parse
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path/filepath"
)
@@ -138,5 +137,5 @@ func (m MGConfig) Save() error {
if err != nil {
return err
}
return ioutil.WriteFile(mgConf, b, 0o644)
return os.WriteFile(mgConf, b, 0o644)
}

3
parse/myrepos.go
View File

@@ -3,7 +3,6 @@ package parse
import (
"errors"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -60,7 +59,7 @@ func LoadMRConfig() (MRConfig, error) {
if s.IsDir() {
return MRConfig{}, errors.New("expected mrconfig file but got a directory")
}
f, err := ioutil.ReadFile(mrconfPath)
f, err := os.ReadFile(mrconfPath)
if err != nil {
return MRConfig{}, err
}