Skip to content

Commit d293b0e

Browse files
committed
Fix CONFLICT
2 parents 797d0eb + 5c00fbf commit d293b0e

14 files changed

Lines changed: 2338 additions & 311 deletions

File tree

app/globals.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import "tailwindcss";
22

33
@plugin "tailwindcss-animate";
4-
@import "tw-animate-css";
54

65
@custom-variant dark (&:where(.dark, .dark *));
76

0 commit comments

Comments
 (0)