@@ -12,7 +12,11 @@
1212 "@socialgouv/matomo-next": "^1.3.0",
1313 "@tailwindcss/aspect-ratio": "^0.4.0",
1414 "@tlon/sigil-js": "^1.4.5",
15+<<<<<<< HEAD
1516 "@urbit/foundation-design-system": "^0.4.1",
17+=======
18+ "@urbit/foundation-design-system": "^0.3.0",
19+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
1620 "@urbit/markdoc": "^0.1.4",
1721 "axios": "^0.26.1",
1822 "buffer": "^6.0.3",
@@ -87,6 +91,7 @@
8791 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
8892 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
8993 },
94+<<<<<<< HEAD
9095 "node_modules/@next/swc-android-arm-eabi": {
9196 "version": "12.2.5",
9297 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -117,6 +122,8 @@
117122 "node": ">= 10"
118123 }
119124 },
125+=======
126+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
120127 "node_modules/@next/swc-darwin-arm64": {
121128 "version": "12.2.5",
122129 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
@@ -132,6 +139,7 @@
132139 "node": ">= 10"
133140 }
134141 },
142+<<<<<<< HEAD
135143 "node_modules/@next/swc-darwin-x64": {
136144 "version": "12.2.5",
137145 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -282,6 +290,8 @@
282290 "node": ">= 10"
283291 }
284292 },
293+=======
294+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
285295 "node_modules/@nodelib/fs.scandir": {
286296 "version": "2.1.5",
287297 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -358,9 +368,15 @@
358368 "dev": true
359369 },
360370 "node_modules/@urbit/foundation-design-system": {
371+<<<<<<< HEAD
361372 "version": "0.4.1",
362373 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
363374 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
375+=======
376+ "version": "0.3.0",
377+ "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
378+ "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
379+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
364380 "dependencies": {
365381 "@iarna/toml": "^2.2.5",
366382 "core-js": "^3.23.1",
@@ -3177,6 +3193,7 @@
31773193 "resolved": "https://registry.npmjs.org/@next/env/-/env-12.2.5.tgz",
31783194 "integrity": "sha512-vLPLV3cpPGjUPT3PjgRj7e3nio9t6USkuew3JE/jMeon/9Mvp1WyR18v3iwnCuX7eUAm1HmAbJHHLAbcu/EJcw=="
31793195 },
3196+<<<<<<< HEAD
31803197 "@next/swc-android-arm-eabi": {
31813198 "version": "12.2.5",
31823199 "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.2.5.tgz",
@@ -3189,12 +3206,15 @@
31893206 "integrity": "sha512-vMj0efliXmC5b7p+wfcQCX0AfU8IypjkzT64GiKJD9PgiA3IILNiGJr1fw2lyUDHkjeWx/5HMlMEpLnTsQslwg==",
31903207 "optional": true
31913208 },
3209+=======
3210+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
31923211 "@next/swc-darwin-arm64": {
31933212 "version": "12.2.5",
31943213 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.2.5.tgz",
31953214 "integrity": "sha512-VOPWbO5EFr6snla/WcxUKtvzGVShfs302TEMOtzYyWni6f9zuOetijJvVh9CCTzInnXAZMtHyNhefijA4HMYLg==",
31963215 "optional": true
31973216 },
3217+<<<<<<< HEAD
31983218 "@next/swc-darwin-x64": {
31993219 "version": "12.2.5",
32003220 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.2.5.tgz",
@@ -3255,6 +3275,8 @@
32553275 "integrity": "sha512-7h5/ahY7NeaO2xygqVrSG/Y8Vs4cdjxIjowTZ5W6CKoTKn7tmnuxlUc2h74x06FKmbhAd9agOjr/AOKyxYYm9Q==",
32563276 "optional": true
32573277 },
3278+=======
3279+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
32583280 "@nodelib/fs.scandir": {
32593281 "version": "2.1.5",
32603282 "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3315,9 +3337,15 @@
33153337 "dev": true
33163338 },
33173339 "@urbit/foundation-design-system": {
3340+<<<<<<< HEAD
33183341 "version": "0.4.1",
33193342 "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.4.1.tgz",
33203343 "integrity": "sha512-EFGtqABqIlJYQhaCJ7p/GlS0Wq2MrtF1H0vXC5p1l+na+aV5CGT0oXIR5dDt4hUgCD1gh9rX0QI9qnu2YKpAeA==",
3344+=======
3345+ "version": "0.3.0",
3346+ "resolved": "https://registry.npmjs.org/@urbit/foundation-design-system/-/foundation-design-system-0.3.0.tgz",
3347+ "integrity": "sha512-ulboVEzctsoGnYz4N6Q83MBx95nMz2ybBB3sOg7c6ip5bz774H06LzDAGT/tpkR92HTzQnZ5gux0Kx0whsnuww==",
3348+>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
33213349 "requires": {
33223350 "@iarna/toml": "^2.2.5",
33233351 "core-js": "^3.23.1",