Fix remaining conflict in cmd cli
This commit is contained in:
parent
462c0d7677
commit
599815c343
12
cmd/main.go
12
cmd/main.go
@ -88,22 +88,12 @@ func main() {
|
||||
MenuSeparator: menuSeparator,
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
|
||||
=======
|
||||
resourceDir := scriptDir
|
||||
menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
|
||||
|
||||
if gettextDir != "" {
|
||||
menuStorageService = menuStorageService.WithGettext(gettextDir, langs.Langs())
|
||||
}
|
||||
|
||||
err = menuStorageService.EnsureDbDir()
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
>>>>>>> master
|
||||
|
||||
rs, err := menuStorageService.GetResource(ctx)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, err.Error())
|
||||
|
Loading…
Reference in New Issue
Block a user