From a5540b231ed6dc69f4f488050d5acf612d4eddb3 Mon Sep 17 00:00:00 2001 From: Ishaan Gupta Date: Sun, 13 Apr 2025 14:09:05 +0530 Subject: [PATCH 1/2] Minor fix for lib folder in gitignore --- .gitignore | 1 - frontend/src/lib/utils.ts | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 frontend/src/lib/utils.ts diff --git a/.gitignore b/.gitignore index 15201ac..ad6b8fb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ dist/ downloads/ eggs/ .eggs/ -lib/ lib64/ parts/ sdist/ diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts new file mode 100644 index 0000000..77f4d80 --- /dev/null +++ b/frontend/src/lib/utils.ts @@ -0,0 +1,6 @@ +import { clsx, type ClassValue } from 'clsx'; +import { twMerge } from 'tailwind-merge'; + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)); +} \ No newline at end of file From 0f9f5f71aedae7e1af6896010573f07c319fa783 Mon Sep 17 00:00:00 2001 From: Ishaan Gupta Date: Sun, 13 Apr 2025 14:21:39 +0530 Subject: [PATCH 2/2] Minor fix --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ad6b8fb..967feb0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ dist/ downloads/ eggs/ .eggs/ +lib/ +!frontend/src/lib lib64/ parts/ sdist/