Skip to content

Commit 33d8065

Browse files
merging all conflicts
2 parents 9a258e2 + 2c7798d commit 33d8065

File tree

106 files changed

+2846
-555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2846
-555
lines changed

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@
6363
"asyncro": "^3.0.0",
6464
"autoprefixer": "^10.4.2",
6565
"babel-eslint": "10.x",
66+
<<<<<<< HEAD
6667
"babel-plugin-react-compiler": "^19.1.0-rc.3",
68+
=======
69+
"babel-plugin-react-compiler": "^1.0.0",
70+
>>>>>>> 2c7798dcc51fbd07ebe41f49e5ded4839a029f72
6771
"chalk": "4.1.2",
6872
"eslint": "7.x",
6973
"eslint-config-next": "12.0.3",
291 KB
Loading
130 KB
Loading
292 KB
Loading
122 KB
Loading
121 KB
Loading
51.7 KB
Loading
126 KB
Loading
51.3 KB
Loading
41.5 KB
Loading

0 commit comments

Comments
 (0)