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

Resolve merge conflicts from main

Browse Source 
- login.go: keep both new imports (mdm + nbnet + server)
- ios/NetBirdSDK/client.go: additive struct-field merge (mdmLoader + stateMu/connectClient/config)
- setconfig_mdm_test.go: adopt new withMDMPolicy(t, s, policy) signature; fix stray old-signature call in TestSetConfig_MDMAllow_ManagementURLPortNormalized
This commit is contained in:
riccardom
2026-07-28 11:04:04 +02:00
parent e1ffb165a4
commit e92aa7dfb0
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/cmd/login.go
View File

@@ -17,11 +17,8 @@ import (
"github.com/netbirdio/netbird/client/internal"
"github.com/netbirdio/netbird/client/internal/auth"
"github.com/netbirdio/netbird/client/internal/profilemanager"
<<<<<<< ours
"github.com/netbirdio/netbird/client/mdm"
=======
nbnet "github.com/netbirdio/netbird/client/net"
>>>>>>> theirs
"github.com/netbirdio/netbird/client/proto"
"github.com/netbirdio/netbird/client/server"
"github.com/netbirdio/netbird/client/system"