From e64bd8b0f02cee7bc55b61796c3c33de584e6688 Mon Sep 17 00:00:00 2001 From: Bryan White Date: Wed, 6 Sep 2023 11:49:38 +0200 Subject: [PATCH] fix: typo in comment (#17635) (cherry picked from commit 01b8be0c8449472819ea979bbf2a312c3412453a) # Conflicts: # client/config/config.go --- client/config/config.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/config/config.go b/client/config/config.go index f9e48c989d88..d28a7a145854 100644 --- a/client/config/config.go +++ b/client/config/config.go @@ -56,7 +56,11 @@ func ReadFromClientConfig(ctx client.Context) (client.Context, error) { configFilePath := filepath.Join(configPath, "client.toml") conf := defaultClientConfig() +<<<<<<< HEAD // if config.toml file does not exist we create it and write default ClientConfig values into it. +======= + // when client.toml does not exist create and init with default values +>>>>>>> 01b8be0c8 (fix: typo in comment (#17635)) if _, err := os.Stat(configFilePath); os.IsNotExist(err) { if err := ensureConfigPath(configPath); err != nil { return ctx, fmt.Errorf("couldn't make client config: %v", err)