Resolving merge conflicts

pragyagarg642 · nicolaskruchten · commit 3662e90f94c5 · 2020-05-09T13:28:52.000-04:00
diff --git a/packages/javascript/jupyterlab-plotly/package.json b/packages/javascript/jupyterlab-plotly/package.json
@@ -31,7 +31,11 @@
     "typescript": "~3.7.0"
   },
   "dependencies": {
+<<<<<<< HEAD
     "plotly.js": "^1.54.1",
+=======
+    "plotly.js": "^1.53.0",
+>>>>>>> 1c80d7555... Resolving merge conflicts
     "@types/plotly.js": "1.44.28",
     "@jupyterlab/rendermime-interfaces": "^1.3.0 || ^2.0.0",
     "@lumino/messaging": "^1.2.3",
diff --git a/packages/javascript/plotlywidget/package.json b/packages/javascript/plotlywidget/package.json
@@ -33,7 +33,11 @@
     "typescript": "~3.1.1"
   },
   "dependencies": {
+<<<<<<< HEAD
     "plotly.js": "^1.54.1",
+=======
+    "plotly.js": "^1.53.0",
+>>>>>>> 1c80d7555... Resolving merge conflicts
     "@jupyter-widgets/base": "^2.0.0 || ^3.0.0",
     "lodash": "^4.17.4"
   },
