Skip to content

Commit 31b1664

Browse files
LauraBeatrisNicolasLopes7
authored andcommitted
Add enterprise_sso for session reverification
1 parent bcbd0a0 commit 31b1664

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

packages/types/src/factors.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,10 @@ export type EnterpriseSSOConfig = EnterpriseSSOFactor & {
127127
/**
128128
* @experimental
129129
*/
130-
<<<<<<< HEAD
131130
emailAddressId?: string;
132131
/**
133132
* @experimental
134133
*/
135-
=======
136-
>>>>>>> a66357e8a (feat(clerk-js,types,localizations): Choose enterprise connection on sign-in/sign-up (#6947))
137134
enterpriseConnectionId?: string;
138135
};
139136

0 commit comments

Comments
 (0)