From 9791b8bdb02f2c5dc375afe05f84d255b6ceae8d Mon Sep 17 00:00:00 2001
From: Victor Radael <victorradael@hotmail.com>
Date: Thu, 7 Jul 2022 16:55:04 -0300
Subject: [PATCH] Merge main

---
 src/app.module.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app.module.ts b/src/app.module.ts
index 64473b1..39a893f 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -27,6 +27,7 @@ import { TransformationsClientConfiguration } from './clients/transformations/cl
 import { InputsClientConfiguration } from './clients/inputs/client.config';
 import { PipelinesClientConfiguration } from './clients/pipelines/client.config';
 import { CatalogController } from './modules/catalog/catalog.controller';
+import { ConnectorModule } from './modules/connector/connector.module';
 import { CatalogService } from './modules/catalog/catalog.service';
 import { OauthController } from './modules/oauth/oauth.controller';
 import { getOauthSecrets } from './utils/OauthSecrets';
@@ -37,8 +38,11 @@ import { APP_GUARD } from '@nestjs/core';
 import { GoogleStrategy } from './modules/oauth/passport-strategies/google-strategy';
 import { MailChimpStrategy } from './modules/oauth/passport-strategies/mailchimp-strategy';
 import { SalesforceStrategy } from './modules/oauth/passport-strategies/salesforce-strategy';
+<<<<<<< Updated upstream
+=======
 
 import { ConnectorModule } from './modules/connector/connector.module';
+>>>>>>> Stashed changes
 
 const inputClient = new InputsClientConfiguration();
 const outputClient = new OutputsClientConfiguration();
@@ -82,6 +86,8 @@ const transformationClient = new TransformationsClientConfiguration();
     ConfigModule.forRoot({
       isGlobal: true,
     }),
+    ConnectorModule,
+
     AuthModule,
     PermissionsModule,
     ConnectorModule,