File tree 2 files changed +9
-4
lines changed
2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 102
102
"@nuxtjs/pwa" : " ^3.3.5" ,
103
103
"@nuxtjs/robots" : " ^2.5.0" ,
104
104
"@nuxtjs/sitemap" : " ^2.4.0" ,
105
+ <<<<<<< dependabot/npm_and_yarn/testing-library/jest-dom-5.12.0
106
+ "@testing-library/jest-dom" : " ^5.12.0" ,
107
+ "@vue/test-utils" : " ^1.1.2" ,
108
+ =======
105
109
"@testing-library/jest-dom" : " ^5.11.9" ,
106
110
"@vue/test-utils" : " ^1.1.4" ,
111
+ >>>>>>> dev
107
112
"autoprefixer" : " ^10.2.4" ,
108
113
"babel-core" : " ^7.0.0-bridge.0" ,
109
114
"babel-eslint" : " ^10.1.0" ,
Original file line number Diff line number Diff line change 1599
1599
dependencies:
1600
1600
"@sinonjs/commons" "^1.7.0"
1601
1601
1602
- "@testing-library/jest-dom@^5.11.9 ":
1603
- version "5.11.9 "
1604
- resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.9 .tgz#e6b3cd687021f89f261bd53cbe367041fbd3e975 "
1605
- integrity sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ ==
1602
+ "@testing-library/jest-dom@^5.12.0 ":
1603
+ version "5.12.0 "
1604
+ resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.12.0 .tgz#6a5d340b092c44b7bce17a4791b47d9bc2c61443 "
1605
+ integrity sha512-N9Y82b2Z3j6wzIoAqajlKVF1Zt7sOH0pPee0sUHXHc5cv2Fdn23r+vpWm0MBBoGJtPOly5+Bdx1lnc3CD+A+ow ==
1606
1606
dependencies:
1607
1607
"@babel/runtime" "^7.9.2"
1608
1608
"@types/testing-library__jest-dom" "^5.9.1"
You can’t perform that action at this time.
0 commit comments