Fix conflicts

This commit is contained in:
Jan Oberhauser
2021-03-25 17:10:02 +01:00
parent 1a2b3dfbdc
commit 0f9429b261
42 changed files with 195 additions and 22 deletions

View File

@@ -56,7 +56,7 @@ export class Mailchimp implements INodeType {
description: INodeTypeDescription = {
displayName: 'Mailchimp',
name: 'mailchimp',
icon: 'file:mailchimp.png',
icon: 'file:mailchimp.svg',
group: ['output'],
version: 1,
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',

View File

@@ -19,7 +19,7 @@ export class MailchimpTrigger implements INodeType {
description: INodeTypeDescription = {
displayName: 'Mailchimp Trigger',
name: 'mailchimpTrigger',
icon: 'file:mailchimp.png',
icon: 'file:mailchimp.svg',
group: ['trigger'],
version: 1,
description: 'Handle Mailchimp events via webhooks',

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB