awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-17 16:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts for variable imports

Browse Source
This commit is contained in:
Tuan Dang
2023-05-03 19:30:30 +03:00
parent 099cee7f39 ca31a70032
commit c766686670
10 changed files with 82 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/variables/index.ts
+1 -1
View File
@@ -10,4 +10,4 @@ export * from './secret';
export * from './smtp';
export * from './stripe';
export * from './token';
export * from './user';
export * from './user';
backend/src/variables/smtp.ts
+2 -1
View File
@@ -1,4 +1,5 @@
export const SMTP_HOST_SENDGRID = 'smtp.sendgrid.net';
export const SMTP_HOST_MAILGUN = 'smtp.mailgun.org';
export const SMTP_HOST_SOCKETLABS = 'smtp.socketlabs.com';
export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
export const SMTP_HOST_GMAIL = 'smtp.gmail.com';