Skip to content

Commit f7c90b4

Browse files
committed
deal with merge conflicts
1 parent ca8fbea commit f7c90b4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ internal override uint EnableMars(ref uint info)
3131
internal override uint SetConnectionBufferSize(ref uint unsignedPacketSize)
3232
=> SniNativeWrapper.SniSetInfo(Handle, QueryType.SNI_QUERY_CONN_BUFSIZE, ref unsignedPacketSize);
3333

34-
internal override SSPIContextProvider CreateSSPIContextProvider() => new NativeSSPIContextProvider();
34+
internal override SspiContextProvider CreateSspiContextProvider() => new NativeSspiContextProvider();
3535
}
3636
}

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ internal long TimeoutTime
470470

471471
internal abstract uint DisableSsl();
472472

473-
internal abstract SSPIContextProvider CreateSSPIContextProvider();
473+
internal abstract SspiContextProvider CreateSspiContextProvider();
474474

475475
internal abstract uint EnableMars(ref uint info);
476476

0 commit comments

Comments
 (0)