Skip to content

Commit

Permalink
fix: typo in comment (#17635)
Browse files Browse the repository at this point in the history
(cherry picked from commit 01b8be0)

# Conflicts:
#	client/config/config.go
  • Loading branch information
bryanchriswhite authored and mergify[bot] committed Sep 6, 2023
1 parent ceb1b9d commit e64bd8b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions client/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ func ReadFromClientConfig(ctx client.Context) (client.Context, error) {
configFilePath := filepath.Join(configPath, "client.toml")
conf := defaultClientConfig()

<<<<<<< HEAD

Check failure on line 59 in client/config/config.go

View workflow job for this annotation

GitHub Actions / dependency-review

expected statement, found '<<'

Check failure on line 59 in client/config/config.go

View workflow job for this annotation

GitHub Actions / golangci-lint

syntax error: unexpected <<, expecting }

Check failure on line 59 in client/config/config.go

View workflow job for this annotation

GitHub Actions / golangci-lint

expected statement, found '<<' (typecheck)
// 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))

Check failure on line 63 in client/config/config.go

View workflow job for this annotation

GitHub Actions / dependency-review

illegal character U+0023 '#'

Check failure on line 63 in client/config/config.go

View workflow job for this annotation

GitHub Actions / golangci-lint

invalid character U+0023 '#' (typecheck)

Check failure on line 63 in client/config/config.go

View workflow job for this annotation

GitHub Actions / golangci-lint

illegal character U+0023 '#' (typecheck)
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)
Expand Down

0 comments on commit e64bd8b

Please sign in to comment.