extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-25 12:12:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix route conflict

Browse Source
This commit is contained in:
Viktor Liu 2025-02-25 11:44:21 +01:00
parent f8fd65a65f
commit 81ee172db8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/internal/routemanager/server_nonandroid.go
View File

@ -12,11 +12,7 @@ import (
firewall "github.com/netbirdio/netbird/client/firewall/manager" firewall "github.com/netbirdio/netbird/client/firewall/manager"
"github.com/netbirdio/netbird/client/internal/peer" "github.com/netbirdio/netbird/client/internal/peer"
<<<<<<< HEAD
=======
"github.com/netbirdio/netbird/client/internal/routemanager/iface" "github.com/netbirdio/netbird/client/internal/routemanager/iface"
"github.com/netbirdio/netbird/client/internal/routemanager/systemops"
>>>>>>> main
"github.com/netbirdio/netbird/route" "github.com/netbirdio/netbird/route"
) )