Skip to content

Commit aa89550

Browse files
committed
resolve conflict
2 parents 3d83ed7 + 9a34a38 commit aa89550

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"react-dom": "^16.4.1",
1010
"react-redux": "^5.0.7",
1111
"react-scripts": "1.1.4",
12-
"recompose": "^0.27.1",
13-
"redux": "^4.0.0",
14-
"styled-components": "^3.3.3",
15-
"uuid": "^3.2.1"
12+
"recompose": "0.27.1",
13+
"redux": "4.0.0",
14+
"styled-components": "3.3.3",
15+
"uuid": "3.2.1"
1616
},
1717
"scripts": {
1818
"start": "react-scripts start",
@@ -21,7 +21,7 @@
2121
"eject": "react-scripts eject"
2222
},
2323
"devDependencies": {
24-
"enzyme": "^3.3.0",
25-
"enzyme-adapter-react-16": "^1.1.1"
24+
"enzyme": "3.3.0",
25+
"enzyme-adapter-react-16": "1.1.1"
2626
}
2727
}

renovate.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"extends": [
3+
"config:base"
4+
]
5+
}

yarn.lock

+11-11
Original file line numberDiff line numberDiff line change
@@ -2322,7 +2322,7 @@ entities@^1.1.1, entities@~1.1.1:
23222322
version "1.1.1"
23232323
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
23242324

2325-
enzyme-adapter-react-16@^1.1.1:
2325+
enzyme-adapter-react-16@1.1.1:
23262326
version "1.1.1"
23272327
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
23282328
dependencies:
@@ -2342,7 +2342,7 @@ enzyme-adapter-utils@^1.3.0:
23422342
object.assign "^4.0.4"
23432343
prop-types "^15.6.0"
23442344

2345-
enzyme@^3.3.0:
2345+
enzyme@3.3.0:
23462346
version "3.3.0"
23472347
resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479"
23482348
dependencies:
@@ -5988,8 +5988,8 @@ react-dev-utils@^5.0.1:
59885988
text-table "0.2.0"
59895989

59905990
react-dom@^16.4.1:
5991-
version "16.4.1"
5992-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.1.tgz#7f8b0223b3a5fbe205116c56deb85de32685dad6"
5991+
version "16.4.2"
5992+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
59935993
dependencies:
59945994
fbjs "^0.8.16"
59955995
loose-envify "^1.1.0"
@@ -6184,7 +6184,7 @@ readdirp@^2.0.0:
61846184
readable-stream "^2.0.2"
61856185
set-immediate-shim "^1.0.1"
61866186

6187-
"recompose@^0.26.0 || ^0.27.0", recompose@^0.27.1:
6187+
recompose@0.27.1, "recompose@^0.26.0 || ^0.27.0":
61886188
version "0.27.1"
61896189
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.27.1.tgz#1a49e931f183634516633bbb4f4edbfd3f38a7ba"
61906190
dependencies:
@@ -6222,7 +6222,7 @@ reduce-function-call@^1.0.1:
62226222
dependencies:
62236223
balanced-match "^0.4.2"
62246224

6225-
redux@^4.0.0:
6225+
redux@4.0.0:
62266226
version "4.0.0"
62276227
resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03"
62286228
dependencies:
@@ -6931,7 +6931,7 @@ style-loader@0.19.0:
69316931
loader-utils "^1.0.2"
69326932
schema-utils "^0.3.0"
69336933

6934-
styled-components@^3.3.3:
6934+
styled-components@3.3.3:
69356935
version "3.3.3"
69366936
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686"
69376937
dependencies:
@@ -7396,14 +7396,14 @@ utils-merge@1.0.1:
73967396
version "1.0.1"
73977397
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
73987398

7399+
uuid@3.2.1, uuid@^3.1.0:
7400+
version "3.2.1"
7401+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
7402+
73997403
uuid@^2.0.2:
74007404
version "2.0.3"
74017405
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
74027406

7403-
uuid@^3.1.0, uuid@^3.2.1:
7404-
version "3.2.1"
7405-
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
7406-
74077407
validate-npm-package-license@^3.0.1:
74087408
version "3.0.3"
74097409
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"

0 commit comments

Comments
 (0)