Skip to content

Commit

Permalink
Merge pull request #507 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Aug 11, 2019
2 parents 16d1b9a + 0c19713 commit 3e2552a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@babel/core": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.5.5",
"@blackflux/eslint-plugin-rules": "1.1.0",
"@blackflux/eslint-plugin-rules": "1.1.2",
"@blackflux/robo-config-plugin": "2.4.4",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
Expand Down Expand Up @@ -101,7 +101,7 @@
"lodash.clonedeep": "4.5.0",
"lodash.difference": "4.5.0",
"lodash.get": "4.4.2",
"object-deep-contain": "1.0.13",
"object-deep-contain": "1.0.14",
"object-scan": "10.0.6",
"object-treeify": "1.1.14",
"smart-fs": "1.9.3"
Expand Down
15 changes: 10 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.1.0.tgz#fb48926234c07f5b2a2b46f5b3a5f88b8d4bc2ac"
integrity sha512-YW7D/rnCZn6zZUGTgd28X/yaKHaKFj5o4iuV0lptEejz7iNE+WrDjZNZ3oTVmn0JxARP0gn5ZcyeYef6ToIkdw==
"@blackflux/eslint-plugin-rules@1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.1.2.tgz#97e76bf383f7634988c75cc24b05bab0db11270e"
integrity sha512-QGpFr1zTF75tVq94+8teil4Hq0h5ATRUMeLeuhh9NShTOh9uKltZvCL15bttUPdfM0MCP5wJxb/OuYviwUZHGQ==
dependencies:
smart-fs "1.9.2"
smart-fs "1.9.3"

"@blackflux/robo-config-plugin@2.4.4":
version "2.4.4"
Expand Down Expand Up @@ -4969,6 +4969,11 @@ object-deep-contain@1.0.13:
resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.13.tgz#2d7b94ad5a2e2da535701d1f0d67ce4c2135f8cf"
integrity sha512-GYKKbftOzyjAfF6m5gL3YLs2MoE2Z3RtyTvJCljfoUleRIHtObSbCgQzUL2W5lZA9bHOjOh9Qy8Jzo8pZth5eA==

object-deep-contain@1.0.14:
version "1.0.14"
resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.14.tgz#c9c622e3355259c0935f43fe668d6e667cd2e83f"
integrity sha512-WjwbNvoXPAjPidDXvEKnPlB36gMIA0cG5b3i6ZMTAFKPaQWCa5ILE2B3wMc3yykceKTOwnsxgVfmsnrmO0Zl4A==

object-keys@^1.0.11, object-keys@^1.0.12:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
Expand Down

0 comments on commit 3e2552a

Please sign in to comment.