From 8ecac3905b8437c0f4e5629620417cd0d91a2a1a Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Mon, 30 Dec 2024 17:22:52 +0100 Subject: [PATCH] Fix merge issue Signed-off-by: Rohit Nayak --- go/cmd/internal/docgen/docgen.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go/cmd/internal/docgen/docgen.go b/go/cmd/internal/docgen/docgen.go index 346846ed4e1..ab38e9420bc 100644 --- a/go/cmd/internal/docgen/docgen.go +++ b/go/cmd/internal/docgen/docgen.go @@ -203,11 +203,7 @@ func anonymizeHomedir(file string) (err error) { // We're replacing the stuff inside the square brackets in the example sed // below: // 's:Paths to search for config files in. (default \[.*\])$:Paths to search for config files in. (default \[\]):' -<<<<<<< HEAD - sed := exec.Command("sed", "-i", "", "-e", fmt.Sprintf("s:%s::i", wd), file) -======= sed := exec.Command("sed", "-i", "", "-e", fmt.Sprintf("s:%s:%s:", wd, ""), file) ->>>>>>> 5c19f87b51 ([Direct PR] [V21 backport] CobraDocs: Remove commit hash from docs. Fix issue with workdir replacement (#17392) (#17444)) if out, err := sed.CombinedOutput(); err != nil { return fmt.Errorf("%w: %s", err, out) }