From 29b5f58de7a5f027ea70932bf3c6d4a02de3ffdd Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:49:31 -0500 Subject: fix merge conflict --- internal/output/console.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'internal/output') diff --git a/internal/output/console.go b/internal/output/console.go index 42b0e3f..1a4efad 100644 --- a/internal/output/console.go +++ b/internal/output/console.go @@ -24,19 +24,13 @@ func (c ConsoleOutputter) Output(message string) error { return nil } -<<<<<<< Updated upstream -func (c ConsoleOutputter) Error(message string) error { - _, err := fmt.Fprintln(c.stderr, message) - if err != nil { - return fmt.Errorf("unable to print message %s: %w", message, err) - } - return nil -======= func (c ConsoleOutputter) Error(err error) error { msg := err.Error() _, printErr := fmt.Fprintln(c.stderr, msg) - return fmt.Errorf("unable to print message %s: %w", msg, printErr) ->>>>>>> Stashed changes + if printErr != nil { + return fmt.Errorf("unable to print message %s: %w", msg, printErr) + } + return nil } func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { -- cgit v1.2.3