sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-02 04:51:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
riccardom
2026-08-25 16:58:25 +02:00
parent 12789d158e
commit c41d439185
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/cmd/up.go
View File

@@ -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"

4
client/embed/embed.go
View File

@@ -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"

3
client/ios/NetBirdSDK/client.go
View File

@@ -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"