|
|
@@ -25,11 +25,19 @@
|
|
|
"dev": true
|
|
|
},
|
|
|
"@babel/parser": {
|
|
|
+<<<<<<< HEAD
|
|
|
+ "version": "7.25.3",
|
|
|
+ "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.3.tgz",
|
|
|
+ "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
|
|
|
+ "requires": {
|
|
|
+ "@babel/types": "^7.25.2"
|
|
|
+=======
|
|
|
"version": "7.25.6",
|
|
|
"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.6.tgz",
|
|
|
"integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
|
|
|
"requires": {
|
|
|
"@babel/types": "^7.25.6"
|
|
|
+>>>>>>> 103227442b0d8b347373a1ffb3b2bf083bb944fb
|
|
|
},
|
|
|
"dependencies": {
|
|
|
"@babel/helper-validator-identifier": {
|
|
|
@@ -38,9 +46,15 @@
|
|
|
"integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
|
|
|
},
|
|
|
"@babel/types": {
|
|
|
+<<<<<<< HEAD
|
|
|
+ "version": "7.25.2",
|
|
|
+ "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.25.2.tgz",
|
|
|
+ "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
|
|
|
+=======
|
|
|
"version": "7.25.6",
|
|
|
"resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.25.6.tgz",
|
|
|
"integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
|
|
|
+>>>>>>> 103227442b0d8b347373a1ffb3b2bf083bb944fb
|
|
|
"requires": {
|
|
|
"@babel/helper-string-parser": "^7.24.8",
|
|
|
"@babel/helper-validator-identifier": "^7.24.7",
|
|
|
@@ -1444,9 +1458,15 @@
|
|
|
},
|
|
|
"dependencies": {
|
|
|
"postcss": {
|
|
|
+<<<<<<< HEAD
|
|
|
+ "version": "8.4.41",
|
|
|
+ "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.41.tgz",
|
|
|
+ "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
|
|
|
+=======
|
|
|
"version": "8.4.45",
|
|
|
"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.45.tgz",
|
|
|
"integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
|
|
|
+>>>>>>> 103227442b0d8b347373a1ffb3b2bf083bb944fb
|
|
|
"requires": {
|
|
|
"nanoid": "^3.3.7",
|
|
|
"picocolors": "^1.0.1",
|
|
|
@@ -10930,9 +10950,15 @@
|
|
|
"dev": true
|
|
|
},
|
|
|
"picocolors": {
|
|
|
+<<<<<<< HEAD
|
|
|
+ "version": "1.0.1",
|
|
|
+ "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz",
|
|
|
+ "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
|
|
|
+=======
|
|
|
"version": "1.1.0",
|
|
|
"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.0.tgz",
|
|
|
"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
|
|
|
+>>>>>>> 103227442b0d8b347373a1ffb3b2bf083bb944fb
|
|
|
},
|
|
|
"picomatch": {
|
|
|
"version": "2.2.2",
|
