lint

matifali · matifali · commit 93b2d385b6bb · 2023-10-17T06:46:52.000Z
diff --git a/cli/templates.go b/cli/templates.go
@@ -3,10 +3,11 @@ package cli
 import (
 	"time"
 
-	"github.com/coder/pretty"
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/pretty"
+
 	"github.com/coder/coder/v2/cli/clibase"
 	"github.com/coder/coder/v2/cli/cliui"
 	"github.com/coder/coder/v2/codersdk"
diff --git a/cli/templateversionarchive.go b/cli/templateversionarchive.go
@@ -6,9 +6,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coder/pretty"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/pretty"
+
 	"github.com/coder/coder/v2/cli/clibase"
 	"github.com/coder/coder/v2/cli/cliui"
 	"github.com/coder/coder/v2/codersdk"
diff --git a/cli/templateversions.go b/cli/templateversions.go
@@ -5,10 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coder/pretty"
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/pretty"
+
 	"github.com/coder/coder/v2/cli/clibase"
 	"github.com/coder/coder/v2/cli/cliui"
 	"github.com/coder/coder/v2/codersdk"
diff --git a/site/build/tsconfig.tsbuildinfo b/site/build/tsconfig.tsbuildinfo
diff --git a/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx b/site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
@@ -13,14 +13,9 @@ const Language = {
   workspaceTooltipText:
     "A workspace is your development environment in the cloud. It includes the infrastructure and tools you need to work on your project.",
   workspaceTooltipLink1: "Create Workspaces",
-<<<<<<< HEAD:site/src/components/Tooltips/WorkspaceHelpTooltip.tsx
-  workspaceTooltipLink2: "Editors and IDEs",
-}
-=======
   workspaceTooltipLink2: "Connect with SSH",
   workspaceTooltipLink3: "Editors and IDEs",
 };
->>>>>>> main:site/src/pages/WorkspacesPage/WorkspaceHelpTooltip.tsx
 
 export const WorkspaceHelpTooltip: FC = () => {
   return (
