gmakstutis/openrag
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

remove merge marker

Browse source
This commit is contained in:
Brent O'Neill 2025-09-24 14:32:18 -06:00
parent 6a495b3011
commit cca68d645c
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frontend/components/ui/select.tsx
View file

@ -1,6 +1,5 @@
"use client"; "use client";
<<<<<<< HEAD
import * as React from "react"; import * as React from "react";
import * as SelectPrimitive from "@radix-ui/react-select"; import * as SelectPrimitive from "@radix-ui/react-select";
import { import {
@ -10,11 +9,6 @@ import {
ChevronUp, ChevronUp,
LockIcon, LockIcon,
} from "lucide-react"; } 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"; import { cn } from "@/lib/utils";