Skip to content

Commit

Permalink
Merge pull request #321 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Oct 23, 2019
2 parents f08d038 + 29f0901 commit e79e320
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"@babel/core": "7.6.4",
"@babel/plugin-proposal-object-rest-spread": "7.6.2",
"@babel/register": "7.6.2",
"@blackflux/eslint-plugin-rules": "1.3.14",
"@blackflux/eslint-plugin-rules": "1.3.15",
"@blackflux/robo-config-plugin": "2.6.15",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
"coveralls": "3.0.7",
"eslint": "6.5.1",
"eslint-config-airbnb-base": "14.0.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-json": "2.0.0",
"eslint-plugin-json": "2.0.1",
"eslint-plugin-markdown": "1.0.1",
"eslint-plugin-mocha": "6.2.0",
"js-gardener": "2.0.109",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.14":
version "1.3.14"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.14.tgz#bbd16fd1c506d7d3861828c8394f95e5745a3b5d"
integrity sha512-fLSA6PIJ8rVTiMVT+EIcVKGfViR/Tt6HILY7UTaocPitf7Huq91FVnSeltPCjm2ZYJ8apAv+NLEP15S8Y23ITw==
"@blackflux/eslint-plugin-rules@1.3.15":
version "1.3.15"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.15.tgz#3c70e85f3a16139b475fe3dd28def52f29780b36"
integrity sha512-L8+iF+hwIneYGyrLOS95NqJ1TaaYtMxY4zyiO0o5tsLoXCPNUDNZK3ut0IghmLuYgYShzoUZ9RH5JZghLw4IFg==
dependencies:
smart-fs "1.11.0"

Expand Down Expand Up @@ -2000,10 +2000,10 @@ eslint-plugin-import@2.18.2:
read-pkg-up "^2.0.0"
resolve "^1.11.0"

eslint-plugin-json@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.0.0.tgz#1da8dfc92a0a4fd3cbb6acc5d7ce1891ccf20306"
integrity sha512-FvLllOBtyj5TfnpKqNEg7Lnk1PG6QuqJIqJ5bOJw3/DDfv6X8XFCxleRQJGULItBGgJ14Lc//M5uN1apVactjA==
eslint-plugin-json@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.0.1.tgz#825ba21fed9522a7080044f0692ffffffbc237e3"
integrity sha512-IxKZIlMyBn0tvxlBj2viW0N/UBuoey1oYpV+SNVuNFmy4xsNuwgeoOjzEeFDnVXL0FpIo7UbQSeZ+lfh2D/nLQ==
dependencies:
lodash "^4.17.15"
vscode-json-languageservice "^3.3.5"
Expand Down

0 comments on commit e79e320

Please sign in to comment.