@@ -87,7 +87,6 @@
8787 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
8888 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
8989 },
90−<<<<<<< HEAD
9190 "node_modules/@next/swc-android-arm-eabi": {
9291 "version": "12.2.5",
9392 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -118,8 +117,6 @@
118117 "node": ">= 10"
119118 }
120119 },
121−=======
122−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
123120 "node_modules/@next/swc-darwin-arm64": {
124121 "version": "12.2.5",
125122 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
@@ -135,7 +132,6 @@
135132 "node": ">= 10"
136133 }
137134 },
138−<<<<<<< HEAD
139135 "node_modules/@next/swc-darwin-x64": {
140136 "version": "12.2.5",
141137 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -286,8 +282,6 @@
286282 "node": ">= 10"
287283 }
288284 },
289−=======
290−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
291285 "node_modules/@nodelib/fs.scandir": {
292286 "version": "2.1.5",
293287 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -364,15 +358,9 @@
364358 "dev": true
365359 },
366360 "node_modules/@urbit/foundation-design-system": {
367−<<<<<<< HEAD
368361 "version": "0.4.1",
369362 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
370363 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
371−=======
372− "version": "0.3.0",
373− "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
374− "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
375−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
376364 "dependencies": {
377365 "@iarna/toml": "^2.2.5",
378366 "core-js": "^3.23.1",
@@ -3189,7 +3177,6 @@
31893177 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
31903178 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
31913179 },
3192−<<<<<<< HEAD
31933180 "@next/swc-android-arm-eabi": {
31943181 "version": "12.2.5",
31953182 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -3202,15 +3189,12 @@
32023189 "integrity": "sha512-vMj0efliXmC5b7p+wfcQCX0AfU8IypjkzT64GiKJD9PgiA3IILNiGJr1fw2lyUDHkjeWx/5HMlMEpLnTsQslwg==",
32033190 "optional": true
32043191 },
3205−=======
3206−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
32073192 "@next/swc-darwin-arm64": {
32083193 "version": "12.2.5",
32093194 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
32103195 "integrity": "sha512-VOPWbO5EFr6snla/WcxUKtvzGVShfs302TEMOtzYyWni6f9zuOetijJvVh9CCTzInnXAZMtHyNhefijA4HMYLg==",
32113196 "optional": true
32123197 },
3213−<<<<<<< HEAD
32143198 "@next/swc-darwin-x64": {
32153199 "version": "12.2.5",
32163200 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -3271,8 +3255,6 @@
32713255 "integrity": "sha512-7h5/ahY7NeaO2xygqVrSG/Y8Vs4cdjxIjowTZ5W6CKoTKn7tmnuxlUc2h74x06FKmbhAd9agOjr/AOKyxYYm9Q==",
32723256 "optional": true
32733257 },
3274−=======
3275−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
32763258 "@nodelib/fs.scandir": {
32773259 "version": "2.1.5",
32783260 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3333,15 +3315,9 @@
33333315 "dev": true
33343316 },
33353317 "@urbit/foundation-design-system": {
3336−<<<<<<< HEAD
33373318 "version": "0.4.1",
33383319 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
33393320 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
3340−=======
3341− "version": "0.3.0",
3342− "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
3343− "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
3344−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
33453321 "requires": {
33463322 "@iarna/toml": "^2.2.5",
33473323 "core-js": "^3.23.1",