Make conflict_of synced property

2019-02-10 17:34:20 -06:00
parent feb68907d0
commit 7a61b243ce
7 changed files with 23 additions and 11 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -4830,9 +4830,9 @@
      "dev": true
    },
    "standard-file-js": {
-      "version": "0.3.46",
-      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.46.tgz",
-      "integrity": "sha512-fGym9hkkWr+Fi+FTsNWJXPXUNUkkVf3A/T2Jc1YqqLSK5/ze0Txo3Ij9pVIfWD7EQcTN6arI7vw1ErpoXWfMaw==",
+      "version": "0.3.47",
+      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.47.tgz",
+      "integrity": "sha512-csWmQXj5eTh0uHuuYYD4pP7tEeORtkdlWuZpVBYFCip4ch2Ug4uyKOCjHr3uOYTjLVaQKhkE/6xPpECWASmQMg==",
      "dev": true
    },
    "statuses": {