Merge branch 'master' into update-browserslist-db

openedx · Feb 15, 2024 · ec52516 · ec52516
2 parents 60b41d0 + 5a9d388
commit ec52516
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,6 +56,10 @@
     "react-router": "6.22.0",
     "react-router-dom": "6.22.0",
     "redux": "4.2.1",
+<<<<<<< HEAD
+=======
+    "@redux-devtools/extension": "3.3.0",
+>>>>>>> master
     "redux-logger": "3.0.6",
     "redux-saga": "1.3.0",
     "redux-thunk": "2.4.2",