Skip to content

Commit 4c8d067

Browse files
author
Michael Recachinas
committed
Fix merge conflict with upstream
1 parent 62af5ba commit 4c8d067

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,7 @@
2828
"test": "jest --coverage"
2929
},
3030
"dependencies": {
31-
<<<<<<< HEAD
32-
"grunt": "^1.3.0",
33-
"react": "^16.13.1",
34-
"react-dom": "^16.13.1",
35-
"sigplot": "^2.0.0-rc18"
36-
=======
3731
"sigplot": "^2.0.0-rc19"
38-
>>>>>>> Bump sigplot to 2.0.0-rc19
3932
},
4033
"jest": {
4134
"setupFiles": [

0 commit comments

Comments
 (0)