@@ -7069,21 +7069,13 @@ __metadata:
70697069 languageName: node
70707070 linkType: hard
70717071
7072- <<<<<<< HEAD
70737072"framer-motion@^12.17.2, framer-motion@workspace:packages/framer-motion":
7074- =======
7075- "framer-motion@^12.16.1-alpha.0, framer-motion@workspace:packages/framer-motion":
7076- >>>>>>> 21072701f (v12.16.1-alpha.0)
70777073 version: 0.0.0-use.local
70787074 resolution: "framer-motion@workspace:packages/framer-motion"
70797075 dependencies:
70807076 "@thednp/dommatrix": ^2.0.11
70817077 "@types/three": 0.137.0
7082- <<<<<<< HEAD
70837078 motion-dom: ^12.17.2
7084- =======
7085- motion-dom: ^12.16.1-alpha.0
7086- >>>>>>> 21072701f (v12.16.1-alpha.0)
70877079 motion-utils: ^12.12.1
70887080 three: 0.137.0
70897081 tslib: ^2.4.0
@@ -7848,15 +7840,9 @@ __metadata:
78487840 version: 0.0.0-use.local
78497841 resolution: "html-env@workspace:dev/html"
78507842 dependencies:
7851- <<<<<<< HEAD
78527843 framer-motion: ^12.17.2
78537844 motion: ^12.17.2
78547845 motion-dom: ^12.17.2
7855- =======
7856- framer-motion: ^12.16.1-alpha.0
7857- motion: ^12.16.1-alpha.0
7858- motion-dom: ^12.16.1-alpha.0
7859- >>>>>>> 21072701f (v12.16.1-alpha.0)
78607846 react: ^18.3.1
78617847 react-dom: ^18.3.1
78627848 vite: ^5.2.0
@@ -10641,7 +10627,6 @@ __metadata:
1064110627 languageName: node
1064210628 linkType: hard
1064310629
10644- <<<<<<< HEAD
1064510630"motion-ai@workspace:packages/mcp":
1064610631 version: 0.0.0-use.local
1064710632 resolution: "motion-ai@workspace:packages/mcp"
@@ -10656,9 +10641,6 @@ __metadata:
1065610641 linkType: soft
1065710642
1065810643"motion-dom@^12.17.2, motion-dom@workspace:packages/motion-dom":
10659- =======
10660- "motion-dom@^12.16.1-alpha.0, motion-dom@workspace:packages/motion-dom":
10661- >>>>>>> 21072701f (v12.16.1-alpha.0)
1066210644 version: 0.0.0-use.local
1066310645 resolution: "motion-dom@workspace:packages/motion-dom"
1066410646 dependencies:
@@ -10733,19 +10715,11 @@ __metadata:
1073310715 languageName: unknown
1073410716 linkType: soft
1073510717
10736- <<<<<<< HEAD
1073710718"motion@^12.17.2, motion@workspace:packages/motion":
1073810719 version: 0.0.0-use.local
1073910720 resolution: "motion@workspace:packages/motion"
1074010721 dependencies:
1074110722 framer-motion: ^12.17.2
10742- =======
10743- "motion@^12.16.1-alpha.0, motion@workspace:packages/motion":
10744- version: 0.0.0-use.local
10745- resolution: "motion@workspace:packages/motion"
10746- dependencies:
10747- framer-motion: ^12.16.1-alpha.0
10748- >>>>>>> 21072701f (v12.16.1-alpha.0)
1074910723 tslib: ^2.4.0
1075010724 peerDependencies:
1075110725 "@emotion/is-prop-valid": "*"
@@ -10862,11 +10836,7 @@ __metadata:
1086210836 version: 0.0.0-use.local
1086310837 resolution: "next-env@workspace:dev/next"
1086410838 dependencies:
10865- <<<<<<< HEAD
1086610839 motion: ^12.17.2
10867- =======
10868- motion: ^12.16.1-alpha.0
10869- >>>>>>> 21072701f (v12.16.1-alpha.0)
1087010840 next: 14.x
1087110841 react: ^18.3.1
1087210842 react-dom: ^18.3.1
@@ -12388,11 +12358,7 @@ __metadata:
1238812358 "@typescript-eslint/parser": ^7.2.0
1238912359 "@vitejs/plugin-react-swc": ^3.5.0
1239012360 eslint-plugin-react-refresh: ^0.4.6
12391- <<<<<<< HEAD
1239212361 motion: ^12.17.2
12393- =======
12394- motion: ^12.16.1-alpha.0
12395- >>>>>>> 21072701f (v12.16.1-alpha.0)
1239612362 react: ^19.0.0
1239712363 react-dom: ^19.0.0
1239812364 vite: ^5.2.0
@@ -12464,11 +12430,7 @@ __metadata:
1246412430 "@typescript-eslint/parser": ^7.2.0
1246512431 "@vitejs/plugin-react-swc": ^3.5.0
1246612432 eslint-plugin-react-refresh: ^0.4.6
12467- <<<<<<< HEAD
1246812433 framer-motion: ^12.17.2
12469- =======
12470- framer-motion: ^12.16.1-alpha.0
12471- >>>>>>> 21072701f (v12.16.1-alpha.0)
1247212434 react: ^18.3.1
1247312435 react-dom: ^18.3.1
1247412436 vite: ^5.2.0
0 commit comments