From 599815c343e958234b88a2075670e368ad89a597 Mon Sep 17 00:00:00 2001 From: lash Date: Mon, 6 Jan 2025 09:00:41 +0000 Subject: [PATCH] Fix remaining conflict in cmd cli --- cmd/main.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 8547994..4bf134b 100644 --- a/cmd/main.go +++ b/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())