Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
ethanndickson committed Jul 2, 2024
commit ce0df7b12c0cc6c44e553b7e30976056f85d7357
16 changes: 0 additions & 16 deletions cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,6 @@ var (
)

const (
<<<<<<< HEAD
varURL = "url"
varToken = "token"
varAgentToken = "agent-token"
varAgentTokenFile = "agent-token-file"
varAgentURL = "agent-url"
varHeader = "header"
varHeaderCommand = "header-command"
varNoOpen = "no-open"
varNoVersionCheck = "no-version-warning"
varNoFeatureWarning = "no-feature-warning"
varForceTty = "force-tty"
varVerbose = "verbose"
varDisableDirect = "disable-direct-connections"
=======
varURL = "url"
varToken = "token"
varAgentToken = "agent-token"
Expand All @@ -82,7 +67,6 @@ const (
varOrganizationSelect = "organization"
varDisableDirect = "disable-direct-connections"
varDisableNetworkTelemetry = "disable-network-telemetry"
>>>>>>> 365c3bc71 (chore: add DRPC tailnet & cli implementation)

notLoggedInMessage = "You are not logged in. Try logging in using 'coder login <url>'."

Expand Down