chore: add kodiak file

brunosllz · Aug 30, 2023 · 9ec295a · 9ec295a
1 parent fe1a0f7
commit 9ec295a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -0,0 +1,7 @@
+# .kodiak.toml
+version = 1
+
+[update]
+always = true
+
+merge.delete_branch_on_merge = true
diff --git a/src/components/form.tsx b/src/components/form.tsx
@@ -2,11 +2,11 @@
 
 import * as React from 'react'
 
-import { cn } from '@/lib/utils'
 import { Icons } from './ui/icons'
 import { Button } from './ui/button'
 import { Input } from './ui/input'
 import { Label } from './ui/label'
+import { twMerge } from 'tailwind-merge'
 
 type UserAuthFormProps = React.HTMLAttributes<HTMLDivElement>
 
@@ -23,7 +23,7 @@ export function UserAuthForm({ className, ...props }: UserAuthFormProps) {
   }
 
   return (
-    <div className={cn('grid gap-6', className)} {...props}>
+    <div className={twMerge('grid gap-6', className)} {...props}>
       <form onSubmit={onSubmit}>
         <div className="grid gap-2">
           <div className="grid gap-1">
@@ -53,7 +53,7 @@ export function UserAuthForm({ className, ...props }: UserAuthFormProps) {
           <span className="w-full border-t" />
         </div>
         <div className="relative flex justify-center text-xs uppercase">
-          <span className="bg-background text-muted-foreground px-2">
+          <span className="bg-background px-2 text-muted-foreground">
             Or continue with
           </span>
         </div>

diff --git a/src/lib/utils.ts b/src/lib/utils.ts