Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/maven/org.jacoco-jacoco-maven-…
Browse files Browse the repository at this point in the history
…plugin-0.8.5
  • Loading branch information
SudharakaP authored Oct 14, 2019
2 parents c46a425 + fb70d14 commit 24dec63
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@ngtools/webpack": "8.3.7",
"@types/chai": "4.2.3",
"@types/chai-string": "1.4.2",
"@types/jest": "24.0.13",
"@types/jest": "24.0.18",
"@types/mocha": "5.2.6",
"@types/node": "10.12.27",
"@types/selenium-webdriver": "4.0.3",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -727,10 +727,10 @@
resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==

"@types/[email protected].13":
version "24.0.13"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.13.tgz#10f50b64cb05fb02411fbba49e9042a3a11da3f9"
integrity sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==
"@types/[email protected].18":
version "24.0.18"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.18.tgz#9c7858d450c59e2164a8a9df0905fc5091944498"
integrity sha512-jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ==
dependencies:
"@types/jest-diff" "*"

Expand Down

0 comments on commit 24dec63

Please sign in to comment.