admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix merge issues

Browse Source
This commit is contained in:
ricardo
2020-07-23 17:10:20 -04:00
parent b187a8fd7d
commit 28fcaf79ae
3 changed files with 4 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
View File

@@ -2137,6 +2137,7 @@ export class Pipedrive implements INodeType {
displayName: 'Term',
name: 'term',
type: 'string',
required: true,
displayOptions: {
show: {
operation: [
@@ -2722,12 +2723,6 @@ export class Pipedrive implements INodeType {
responseData = await pipedriveApiRequest.call(this, requestMethod, endpoint, body, qs, formData, downloadFile);
<<<<<<< HEAD
if (responseData.data === null) {
responseData.data = [];
}
=======
>>>>>>> master
}
if (resource === 'file' && operation === 'download') {