Commit 80da656
committed
Fix merge conflict damage in LocalAppContextSwitchesHelper
The 'accept both' merge resolution dropped a SetSwitchValue( token in Dispose()
and a closing brace plus /// <summary> between UseLegacyIdleTimeoutBehavior and
UseOverallConnectTimeoutForPoolWait, causing CS1002/CS1513 compile errors.1 parent 228fe6f commit 80da656
1 file changed
Lines changed: 4 additions & 0 deletions
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
191 | 191 | | |
192 | 192 | | |
193 | 193 | | |
| 194 | + | |
194 | 195 | | |
195 | 196 | | |
196 | 197 | | |
| |||
345 | 346 | | |
346 | 347 | | |
347 | 348 | | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
348 | 352 | | |
349 | 353 | | |
350 | 354 | | |
| |||
0 commit comments