assets

config.codekit3

@@ -1189,39 +1189,74 @@
  "oAP" : "\/src\/Vizy.php",
  "oF" : 0
  },
- "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js" : {
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js" : {
  "bF" : 0,
  "ft" : 64,
  "ma" : 1,
  "mi" : 1,
  "oA" : 0,
- "oAP" : "\/src\/web\/assets\/field\/dist\/js\/vizy-0baa0ce9.js",
+ "oAP" : "\/src\/web\/assets\/field\/dist\/js\/vizy-1d31d33d.js",
  "oF" : 0,
  "sC" : 0,
  "tS" : 0
  },
- "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js.gz" : {
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js.gz" : {
  "cB" : 0,
  "ft" : 8192,
  "hM" : 0,
  "oA" : 0,
- "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js.gz",
+ "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js.gz",
  "oF" : 0
  },
- "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js.map" : {
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js.map" : {
  "cB" : 0,
  "ft" : 8192,
  "hM" : 0,
  "oA" : 0,
- "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js.map",
+ "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js.map",
  "oF" : 0
  },
- "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js.map.gz" : {
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js.map.gz" : {
  "cB" : 0,
  "ft" : 8192,
  "hM" : 0,
  "oA" : 0,
- "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-0baa0ce9.js.map.gz",
+ "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-1d31d33d.js.map.gz",
+ "oF" : 0
+ },
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js" : {
+ "bF" : 0,
+ "ft" : 64,
+ "ma" : 1,
+ "mi" : 1,
+ "oA" : 0,
+ "oAP" : "\/src\/web\/assets\/field\/dist\/js\/vizy-91fcee7d.js",
+ "oF" : 0,
+ "sC" : 0,
+ "tS" : 0
+ },
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js.gz" : {
+ "cB" : 0,
+ "ft" : 8192,
+ "hM" : 0,
+ "oA" : 0,
+ "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js.gz",
+ "oF" : 0
+ },
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js.map" : {
+ "cB" : 0,
+ "ft" : 8192,
+ "hM" : 0,
+ "oA" : 0,
+ "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js.map",
+ "oF" : 0
+ },
+ "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js.map.gz" : {
+ "cB" : 0,
+ "ft" : 8192,
+ "hM" : 0,
+ "oA" : 0,
+ "oAP" : "\/src\/web\/assets\/field\/dist\/assets\/vizy-91fcee7d.js.map.gz",
  "oF" : 0
  },
  "\/src\/web\/assets\/field\/dist\/assets\/vizy-e02a0e63.css" : {
@@ -1543,6 +1578,14 @@
  "oAP" : "\/src\/web\/assets\/field\/src\/js\/components\/input\/VizyBlockFields.vue",
  "oF" : 0
  },
+ "\/src\/web\/assets\/field\/src\/js\/components\/input\/VizyUserTemplate.vue" : {
+ "cB" : 0,
+ "ft" : 8192,
+ "hM" : 0,
+ "oA" : 0,
+ "oAP" : "\/src\/web\/assets\/field\/src\/js\/components\/input\/VizyUserTemplate.vue",
+ "oF" : 0
+ },
  "\/src\/web\/assets\/field\/src\/js\/components\/settings\/AutoSuggest.vue" : {
  "cB" : 0,
  "ft" : 8192,

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

@@ -7,11 +7,7 @@
  "css": [
  "assets/vizy-e02a0e63.css"
  ],
-<<<<<<< HEAD
- "file": "assets/vizy-1d31d33d.js",
-=======
- "file": "assets/vizy-91fcee7d.js",
->>>>>>> origin/craft-4
+ "file": "assets/vizy-62afb6ce.js",
  "isEntry": true,
  "src": "field/src/js/vizy.js"
  }