From edb2ff4034fb194e3e52aa7244ae0cfe8ea58028 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Tue, 30 Apr 2024 20:00:54 -0300 Subject: [PATCH] Fix: resolve merge conflicts --- src/frontend/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/frontend/package.json b/src/frontend/package.json index 19c79b3ed..d9371f385 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -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",