From cca68d645ce24270678f00849cbca3ae3839370b Mon Sep 17 00:00:00 2001
From: Brent O'Neill <brent.oneill@datastax.com>
Date: Wed, 24 Sep 2025 14:32:18 -0600
Subject: [PATCH] remove merge marker

---
 frontend/components/ui/select.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frontend/components/ui/select.tsx b/frontend/components/ui/select.tsx
index 6a0d8bbb..5c139245 100644
--- a/frontend/components/ui/select.tsx
+++ b/frontend/components/ui/select.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-<<<<<<< HEAD
 import * as React from "react";
 import * as SelectPrimitive from "@radix-ui/react-select";
 import {
@@ -10,11 +9,6 @@ import {
   ChevronUp,
   LockIcon,
 } from "lucide-react";
-=======
-import * as React from "react"
-import * as SelectPrimitive from "@radix-ui/react-select"
-import { Check, ChevronDown, ChevronUp, Lock } from "lucide-react"
->>>>>>> main
 
 import { cn } from "@/lib/utils";