TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-04 23:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix forgotten merge conflict

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-08-16 11:06:03 +02:00
parent e4cb443618
commit aac4179759
No known key found for this signature in database
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/tailscaled/tailscaled.go
View File

@ -35,11 +35,8 @@ import (
"tailscale.com/control/controlclient" "tailscale.com/control/controlclient"
"tailscale.com/drive/driveimpl" "tailscale.com/drive/driveimpl"
"tailscale.com/envknob" "tailscale.com/envknob"
<<<<<<< HEAD
"tailscale.com/hostinfo"
=======
"tailscale.com/health" "tailscale.com/health"
>>>>>>> 4a8cbaec4 (move metrics to health package) "tailscale.com/hostinfo"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/ipn/conffile" "tailscale.com/ipn/conffile"
"tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/ipnlocal"