From c41d4391852901a3d8061db63a0390c5130957ca Mon Sep 17 00:00:00 2001 From: riccardom Date: Tue, 25 Aug 2026 16:58:25 +0200 Subject: [PATCH] Resolve merge conflicts --- client/cmd/up.go | 4 ---- client/embed/embed.go | 4 ---- client/ios/NetBirdSDK/client.go | 3 --- 3 files changed, 11 deletions(-) diff --git a/client/cmd/up.go b/client/cmd/up.go index 77224a358..8b49ea504 100644 --- a/client/cmd/up.go +++ b/client/cmd/up.go @@ -21,11 +21,7 @@ import ( "github.com/netbirdio/netbird/client/internal" "github.com/netbirdio/netbird/client/internal/peer" "github.com/netbirdio/netbird/client/internal/profilemanager" -<<<<<<< HEAD "github.com/netbirdio/netbird/client/mdm" - "github.com/netbirdio/netbird/client/proto" -======= ->>>>>>> main nbnet "github.com/netbirdio/netbird/client/net" "github.com/netbirdio/netbird/client/proto" "github.com/netbirdio/netbird/client/server" diff --git a/client/embed/embed.go b/client/embed/embed.go index 3d884a228..4bc3527c6 100644 --- a/client/embed/embed.go +++ b/client/embed/embed.go @@ -21,12 +21,8 @@ import ( "github.com/netbirdio/netbird/client/internal/auth" "github.com/netbirdio/netbird/client/internal/peer" "github.com/netbirdio/netbird/client/internal/profilemanager" -<<<<<<< HEAD "github.com/netbirdio/netbird/client/mdm" - sshcommon "github.com/netbirdio/netbird/client/ssh" -======= nbssh "github.com/netbirdio/netbird/client/ssh" ->>>>>>> main "github.com/netbirdio/netbird/client/system" "github.com/netbirdio/netbird/shared/management/domain" mgmProto "github.com/netbirdio/netbird/shared/management/proto" diff --git a/client/ios/NetBirdSDK/client.go b/client/ios/NetBirdSDK/client.go index 8c58dea04..775be0f59 100644 --- a/client/ios/NetBirdSDK/client.go +++ b/client/ios/NetBirdSDK/client.go @@ -22,12 +22,9 @@ import ( "github.com/netbirdio/netbird/client/internal/listener" "github.com/netbirdio/netbird/client/internal/peer" "github.com/netbirdio/netbird/client/internal/profilemanager" -<<<<<<< HEAD "github.com/netbirdio/netbird/client/mdm" -======= "github.com/netbirdio/netbird/client/netstate" "github.com/netbirdio/netbird/client/netsweep" ->>>>>>> main "github.com/netbirdio/netbird/client/system" "github.com/netbirdio/netbird/formatter" "github.com/netbirdio/netbird/route"