@@ -12,11 +12,7 @@
1212 "@socialgouv/matomo-next": "^1.3.0",
1313 "@tailwindcss/aspect-ratio": "^0.4.0",
1414 "@tlon/sigil-js": "^1.4.5",
15−<<<<<<< HEAD
1615 "@urbit/foundation-design-system": "^0.4.1",
17−=======
18− "@urbit/foundation-design-system": "^0.3.0",
19−>>>>>>> d9f2638717e2d5507b36b17090b12062cc622be9
2016 "@urbit/markdoc": "^0.1.4",
2117 "axios": "^0.26.1",
2218 "buffer": "^6.0.3",