leaflet.pub
a tool for shared writing and social publishing
fixed up some trailing conflcicts
cozylittle.house
+1
-12
package.json
+1
-12
package.json
···
33
33
"@mdx-js/react": "^3.1.0",
34
34
"@next/bundle-analyzer": "^15.3.2",
35
35
"@next/mdx": "15.3.2",
36
-
<<<<<<< HEAD
37
-
"@radix-ui/react-dialog": "^1.1.14",
38
-
"@radix-ui/react-dropdown-menu": "^2.1.14",
39
-
"@radix-ui/react-popover": "^1.1.13",
40
-
"@radix-ui/react-slider": "^1.3.4",
41
-
"@radix-ui/react-tooltip": "^1.2.6",
42
-
"@react-email/components": "^0.5.0",
43
-
=======
36
+
44
37
"@radix-ui/react-dialog": "^1.1.15",
45
38
"@radix-ui/react-dropdown-menu": "^2.1.16",
46
39
"@radix-ui/react-popover": "^1.1.15",
47
40
"@radix-ui/react-slider": "^1.3.6",
48
41
"@radix-ui/react-tooltip": "^1.2.8",
49
-
>>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d
50
42
"@react-spring/web": "^10.0.0-beta.0",
51
43
"@rocicorp/undo": "^0.2.1",
52
44
"@supabase/ssr": "^0.3.0",
···
106
98
"devDependencies": {
107
99
"@atproto/lex-cli": "^0.9.5",
108
100
"@cloudflare/workers-types": "^4.20240512.0",
109
-
<<<<<<< HEAD
110
101
"@react-email/preview-server": "^4.2.8",
111
-
=======
112
102
"@tailwindcss/postcss": "^4.1.13",
113
-
>>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d
114
103
"@types/katex": "^0.16.7",
115
104
"@types/luxon": "^3.7.1",
116
105
"@types/node": "^22.15.17",