From aac41797597b51d48b3cbd39fca538880ecbe28b Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Fri, 16 Aug 2024 11:06:03 +0200 Subject: [PATCH] fix forgotten merge conflict Signed-off-by: Kristoffer Dalby --- cmd/tailscaled/tailscaled.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index 49e71247e..83633dfaf 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -35,11 +35,8 @@ import ( "tailscale.com/control/controlclient" "tailscale.com/drive/driveimpl" "tailscale.com/envknob" -<<<<<<< HEAD - "tailscale.com/hostinfo" -======= "tailscale.com/health" ->>>>>>> 4a8cbaec4 (move metrics to health package) + "tailscale.com/hostinfo" "tailscale.com/ipn" "tailscale.com/ipn/conffile" "tailscale.com/ipn/ipnlocal"