From c630a3583c5504ecb28c38c668e2ce80fcff2411 Mon Sep 17 00:00:00 2001 From: Ricardo Espinoza Date: Sun, 22 Dec 2019 08:12:12 -0500 Subject: [PATCH] fix --- packages/nodes-base/package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index d767f6bee..7912bf316 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -72,13 +72,9 @@ "dist/credentials/TypeformApi.credentials.js", "dist/credentials/MandrillApi.credentials.js", "dist/credentials/TodoistApi.credentials.js", -<<<<<<< HEAD - "dist/credentials/TypeformApi.credentials.js", - "dist/credentials/TogglApi.credentials.js" -======= "dist/credentials/TypeformApi.credentials.js", + "dist/credentials/TogglApi.credentials.js", "dist/credentials/VeroApi.credentials.js" ->>>>>>> master ], "nodes": [ "dist/nodes/ActiveCampaign/ActiveCampaign.node.js",