Test merge 1b - mod hello only

vuil · vuil · commit 7ed2c00dd663 · 2021-09-25T18:46:25.000-07:00
diff --git a/cmd/hello/main.go b/cmd/hello/main.go
@@ -16,5 +16,5 @@ func main() {
 	zl := zerolog.New(os.Stderr)
 	var log logr.Logger = zerologr.New(&zl)
 
-	log.Info("Logr in action!", "the answer", 42)
+	log.Info("Test merge : msg 1b, take 1")
 }

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ func main() {`
`16`	`16`	`zl := zerolog.New(os.Stderr)`
`17`	`17`	`var log logr.Logger = zerologr.New(&zl)`
`18`	`18`
`19`		`- log.Info("Logr in action!", "the answer", 42)`
	`19`	`+ log.Info("Test merge : msg 1b, take 1")`
`20`	`20`	`}`