Fix: resolve merge conflicts

This commit is contained in:
igorrCarvalho 2024-04-30 20:00:54 -03:00
commit edb2ff4034

View file

@ -26,10 +26,7 @@
"@tailwindcss/line-clamp": "^0.4.4",
"@types/axios": "^0.14.0",
"ace-builds": "^1.24.1",
<<<<<<< HEAD
"ag-grid-community": "^31.2.1",
=======
>>>>>>> node-shortcuts-refactor
"ag-grid-react": "^31.2.1",
"ansi-to-html": "^0.7.2",
"axios": "^1.5.0",