Remove changes from merge conflicts

elastic · May 8, 2024 · 7cea22c · 7cea22c
1 parent dbecfda
commit 7cea22c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metricbeat/helper/dialer/dialer_windows.go b/metricbeat/helper/dialer/dialer_windows.go
@@ -61,7 +61,7 @@ func (t *NpipeDialerBuilder) String() string {
 func (t *NpipeDialerBuilder) Make(timeout time.Duration) (transport.Dialer, error) {
 	to := timeout
 	return transport.DialerFunc(
-		func(_ context.Context, _, _ string) (net.Conn, error) {
+		func(_ context.Context, _ string, _ string) (net.Conn, error) {
 			return winio.DialPipe(
 				strings.TrimSuffix(npipe.TransformString(t.Path), "/"),
 				&to,

diff --git a/x-pack/filebeat/input/cel/input.go b/x-pack/filebeat/input/cel/input.go
@@ -1161,7 +1161,7 @@ func cloneMap(dst, src mapstr.M) {
 // walkMap walks to all ends of the provided path in m and applies fn to the
 // final element of each walk. Nested arrays are not handled.
 func walkMap(m mapstr.M, path string, fn func(parent mapstr.M, key string)) {
-	key, rest, more := strings.Cut(path, ".") //nolint:typecheck // reset is used in recursive calls.
+	key, rest, more := strings.Cut(path, ".")
 	v, ok := m[key]
 	if !ok {
 		return