assets

src/web/assets/app/dist/manifest.json

@@ -3,75 +3,48 @@
     "file": "assets/zen-24c98408.css",
     "src": "app/src/js/zen.css"
   },
-<<<<<<< HEAD
-  "app/src/js/svg/success-large.svg?raw": {
-    "file": "assets/success-large-9c1960a9.js",
-    "src": "app/src/js/svg/success-large.svg?raw",
-    "isDynamicEntry": true
-  },
-  "app/src/js/svg/error-large.svg?raw": {
-    "file": "assets/error-large-8d98bc34.js",
-    "src": "app/src/js/svg/error-large.svg?raw",
-=======
-  "app/src/js/svg/export.svg?raw": {
-    "file": "assets/export-bcd80af8.js",
-    "src": "app/src/js/svg/export.svg?raw",
->>>>>>> f744b5eb32826f558c3de8f81d61f957fcc6e3d5
-    "isDynamicEntry": true
-  },
-  "app/src/js/svg/chevron-right.svg?raw": {
-    "file": "assets/chevron-right-5695932b.js",
-    "src": "app/src/js/svg/chevron-right.svg?raw",
-    "isDynamicEntry": true
-  },
-<<<<<<< HEAD
   "app/src/js/svg/arrow-circle.svg?raw": {
     "file": "assets/arrow-circle-afeab343.js",
     "src": "app/src/js/svg/arrow-circle.svg?raw",
-=======
+    "isDynamicEntry": true
+  },
   "app/src/js/svg/chevron-right.svg?raw": {
     "file": "assets/chevron-right-5695932b.js",
     "src": "app/src/js/svg/chevron-right.svg?raw",
->>>>>>> f744b5eb32826f558c3de8f81d61f957fcc6e3d5
     "isDynamicEntry": true
   },
   "app/src/js/svg/error-large.svg?raw": {
     "file": "assets/error-large-8d98bc34.js",
     "src": "app/src/js/svg/error-large.svg?raw",
     "isDynamicEntry": true
   },
-  "app/src/js/svg/koi.svg?raw": {
-    "file": "assets/koi-a426d3b2.js",
-    "src": "app/src/js/svg/koi.svg?raw",
+  "app/src/js/svg/success-large.svg?raw": {
+    "file": "assets/success-large-9c1960a9.js",
+    "src": "app/src/js/svg/success-large.svg?raw",
     "isDynamicEntry": true
   },
-<<<<<<< HEAD
   "app/src/js/svg/import.svg?raw": {
     "file": "assets/import-c23d45c4.js",
     "src": "app/src/js/svg/import.svg?raw",
-=======
+    "isDynamicEntry": true
+  },
   "app/src/js/svg/icon-bg.svg?raw": {
     "file": "assets/icon-bg-ea6a9226.js",
     "src": "app/src/js/svg/icon-bg.svg?raw",
->>>>>>> f744b5eb32826f558c3de8f81d61f957fcc6e3d5
     "isDynamicEntry": true
   },
-  "app/src/js/svg/arrow-circle.svg?raw": {
-    "file": "assets/arrow-circle-afeab343.js",
-    "src": "app/src/js/svg/arrow-circle.svg?raw",
+  "app/src/js/svg/export.svg?raw": {
+    "file": "assets/export-bcd80af8.js",
+    "src": "app/src/js/svg/export.svg?raw",
     "isDynamicEntry": true
   },
-  "app/src/js/svg/success-large.svg?raw": {
-    "file": "assets/success-large-9c1960a9.js",
-    "src": "app/src/js/svg/success-large.svg?raw",
+  "app/src/js/svg/koi.svg?raw": {
+    "file": "assets/koi-a426d3b2.js",
+    "src": "app/src/js/svg/koi.svg?raw",
     "isDynamicEntry": true
   },
   "app/src/js/zen.js": {
-<<<<<<< HEAD
-    "file": "assets/zen-da12f588.js",
-=======
-    "file": "assets/zen-5458f2bc.js",
->>>>>>> f744b5eb32826f558c3de8f81d61f957fcc6e3d5
+    "file": "assets/zen-a93892db.js",
     "src": "app/src/js/zen.js",
     "isEntry": true,
     "dynamicImports": [