solve merge conflicts

This commit is contained in:
x
2025-04-25 19:11:00 -04:00
184 changed files with 3938 additions and 489 deletions
@@ -53,6 +53,7 @@ export const SecretSyncOptionsSection = ({ secretSync, onEditOptions }: Props) =
case SecretSync.Vercel:
case SecretSync.Windmill:
case SecretSync.HCVault:
case SecretSync.TeamCity:
AdditionalSyncOptionsComponent = null;
break;
default: