Fix merge conflict

elastic · Dec 9, 2024 · dd26c5f · dd26c5f
1 parent d0996e3
commit dd26c5f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go
@@ -8,11 +8,8 @@ package config
 import (
 	"context"
 	"errors"
-<<<<<<< HEAD
 	"slices"
-=======
 	"strings"
->>>>>>> d0993e86 (Redact static tokens and custom http headers (#4182))
 	"sync"
 
 	"github.com/gofrs/uuid"