sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-25 16:19:07 +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
client/cmd/up.go
-4
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"