|
|
@ -35959,23 +35959,7 @@ |
|
|
|
"events": { |
|
|
|
"events": { |
|
|
|
"version": "3.2.0", |
|
|
|
"version": "3.2.0", |
|
|
|
"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", |
|
|
|
<<<<<<< .merge_file_cefJCZ |
|
|
|
|
|
|
|
<<<<<<< .merge_file_tWdvvn |
|
|
|
|
|
|
|
<<<<<<< .merge_file_1TnGEE |
|
|
|
|
|
|
|
"integrity": "sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=", |
|
|
|
"integrity": "sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=", |
|
|
|
======= |
|
|
|
|
|
|
|
<<<<<<< .merge_file_LmVJhg |
|
|
|
|
|
|
|
"integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==", |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
"integrity": "sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=", |
|
|
|
|
|
|
|
>>>>>>> .merge_file_PPzkRR |
|
|
|
|
|
|
|
>>>>>>> .merge_file_5Paljn |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
"integrity": "sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=", |
|
|
|
|
|
|
|
>>>>>>> .merge_file_h3FRBn |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
"integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==", |
|
|
|
|
|
|
|
>>>>>>> .merge_file_4gbyDN |
|
|
|
|
|
|
|
"dev": true |
|
|
|
"dev": true |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|