mirror of
https://github.com/primer/css.git
synced 2024-12-04 14:59:16 +03:00
resolve conflicts
This commit is contained in:
parent
19c9d7ed7d
commit
34b65aef4f
6
package-lock.json
generated
6
package-lock.json
generated
@ -2680,9 +2680,9 @@
|
||||
}
|
||||
},
|
||||
"@primer/primitives": {
|
||||
"version": "0.0.0-cacc3de",
|
||||
"resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-cacc3de.tgz",
|
||||
"integrity": "sha512-lbRU9jb+j9mpjpn1ckk4I22jSKb3IUM4uNLhnc+SsgzV4DpOTabRLYny1AmgHVeMDdCrzDMpP44gNe6H3NG0DA=="
|
||||
"version": "0.0.0-90fe697",
|
||||
"resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-90fe697.tgz",
|
||||
"integrity": "sha512-5XDQSGyu2+br2dLCS2yE4Jri4U9Sev5Gv2mtV9P0hHDpcZiHfVES0U8mErjhs4Xsq3XSSwOyHMwqaIHqEc/HQQ=="
|
||||
},
|
||||
"@reach/router": {
|
||||
"version": "1.3.3",
|
||||
|
@ -41,7 +41,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@primer/octicons": "^9.1.1",
|
||||
"@primer/primitives": "0.0.0-cacc3de"
|
||||
"@primer/primitives": "0.0.0-90fe697"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@octokit/rest": "^16.34.0",
|
||||
|
Loading…
Reference in New Issue
Block a user