OV-43: * merge conflicts

BinaryStudioAcademy · Aug 27, 2024 · 3f64270 · 3f64270
1 parent 8460b22
commit 3f64270
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -37,12 +37,14 @@
         "@fortawesome/free-solid-svg-icons": "6.6.0",
         "@fortawesome/react-fontawesome": "0.2.2",
         "@reduxjs/toolkit": "2.2.7",
+        "@remotion/player": "4.0.201",
         "formik": "2.4.6",
         "framer-motion": "11.3.24",
         "react": "18.3.1",
         "react-dom": "18.3.1",
         "react-redux": "9.1.2",
         "react-router-dom": "6.26.0",
+        "remotion": "4.0.201",
         "shared": "*",
         "zod-formik-adapter": "1.3.0"
     }

diff --git a/package-lock.json b/package-lock.json