bad merge

fearful-symmetry · fearful-symmetry · commit 6ff3b4c7a65a · 2021-04-14T12:42:24.000-07:00
diff --git a/libbeat/metric/system/process/process.go b/libbeat/metric/system/process/process.go
@@ -93,7 +93,6 @@ type Stats struct {
 	procRegexps []match.Matcher // List of regular expressions used to whitelist processes.
 	envRegexps  []match.Matcher // List of regular expressions used to whitelist env vars.
 	cgroups     *cgroup.Reader
-	logger      *logp.Logger
 }
 
 // Ticks of CPU for a process

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ type Stats struct {`
`93`	`93`	`procRegexps []match.Matcher // List of regular expressions used to whitelist processes.`
`94`	`94`	`envRegexps []match.Matcher // List of regular expressions used to whitelist env vars.`
`95`	`95`	`cgroups *cgroup.Reader`
`96`		`- logger *logp.Logger`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`// Ticks of CPU for a process`