StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

conflict fix

Browse source
This commit is contained in:
Charles Morgan 2020-08-02 00:11:49 -04:00
parent d3316f61d7
commit a1f1e4294d
No known key found for this signature in database
GPG key ID: D71946CD723249BD
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
package.json
View file

@ -4,7 +4,6 @@
"@fortawesome/fontawesome-svg-core": "1.2.19",
"@fortawesome/free-solid-svg-icons": "^5.9.0",
"@fortawesome/react-fontawesome": "0.1.4",
"@types/react-google-recaptcha": "^1.1.1",
"axios": "^0.19.2",
"ayu-ace": "^2.0.4",
"brace": "^0.11.1",
@ -23,7 +22,6 @@
"path": "^0.12.7",
"query-string": "^6.7.0",
"react": "^16.13.1",
"react-ga": "^3.1.2",
"react-dom": "npm:@hot-loader/react-dom",
"react-fast-compare": "^3.2.0",
"react-google-recaptcha": "^2.0.1",
@ -33,6 +31,7 @@
"react-redux": "^7.1.0",
"react-router-dom": "^5.1.2",
"react-transition-group": "^4.4.1",
"reaptcha": "^1.7.2",
"sockette": "^2.0.6",
"styled-components": "^5.1.1",
"styled-components-breakpoint": "^3.0.0-preview.20",