Fix: resolve merge conflicts
This commit is contained in:
parent
bc3d32b9ed
commit
edb2ff4034
1 changed files with 0 additions and 3 deletions
|
|
@ -26,10 +26,7 @@
|
||||||
"@tailwindcss/line-clamp": "^0.4.4",
|
"@tailwindcss/line-clamp": "^0.4.4",
|
||||||
"@types/axios": "^0.14.0",
|
"@types/axios": "^0.14.0",
|
||||||
"ace-builds": "^1.24.1",
|
"ace-builds": "^1.24.1",
|
||||||
<<<<<<< HEAD
|
|
||||||
"ag-grid-community": "^31.2.1",
|
"ag-grid-community": "^31.2.1",
|
||||||
=======
|
|
||||||
>>>>>>> node-shortcuts-refactor
|
|
||||||
"ag-grid-react": "^31.2.1",
|
"ag-grid-react": "^31.2.1",
|
||||||
"ansi-to-html": "^0.7.2",
|
"ansi-to-html": "^0.7.2",
|
||||||
"axios": "^1.5.0",
|
"axios": "^1.5.0",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue