Fix rebase issue

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · Aug 5, 2024 · aded615 · aded615
1 parent 48a4555
commit aded615
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pkg/server/api_registration.go b/pkg/server/api_registration.go
@@ -24,12 +24,6 @@ import (
 	"io"
 	"net/http"
 	"path"
-<<<<<<< HEAD
-=======
-	"regexp"
-	"strings"
-	"time"
->>>>>>> b7c0db2e (Wait on NetworkConfigReady condition)
 
 	"github.com/gorilla/websocket"
 	"gopkg.in/yaml.v3"