chore: resolve conflicts

Author: k0stik

dist/js/example/property/base.json renamed to dist/js/example/property/holder.json

@@ -9,18 +9,19 @@
     "data": {
         "name": "pressure",
         "units": "kbar",
-        "value": -149.03,
-        "repetition": 0
+        "value": -149.03
     },
     "group": "qe:dft:gga:pbe",
     "owner": {
         "_id": "HtxACY2wX4b2hS8Rv",
         "cls": "Account",
         "slug": "exabyte"
     },
+    "repetition": 0,
     "schemaVersion": "0.2.0",
     "slug": "pressure",
     "source": {
+        "type": "exabyte",
         "info": {
             "jobId": "XnYKCmgaAAzSQH5ac",
             "unitId": "873d0293d04af431d31f07a0-pw-scf"