Commit 3cff337
committed
[fern-replay] Resolved conflicts
Patches replayed:
- patch-4894603d: chore: Restore custom wiring in management/__init__.py
- patch-7271f157: Revert wrapper file to preserve Auth0 telemetry customizations
- patch-c04f0b4d: Fix for incorrect return type and missing __all__ type
- patch-95211006: Restore Auth0 telemetry and custom client wiring after regeneration
- patch-f7384913: Remove duplicate FedCmLoginGooglePatch and FedCmLoginPatch entries
- patch-1e44613d: Added migration guide for v5 to v6
- patch-30b1089a: Updated UPGRADING.md doc1 parent aacbdd5 commit 3cff337
3 files changed
Lines changed: 10 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8820 | 8820 | | |
8821 | 8821 | | |
8822 | 8822 | | |
8823 | | - | |
| 8823 | + | |
8824 | 8824 | | |
8825 | 8825 | | |
8826 | 8826 | | |
| |||
9001 | 9001 | | |
9002 | 9002 | | |
9003 | 9003 | | |
9004 | | - | |
| 9004 | + | |
9005 | 9005 | | |
9006 | 9006 | | |
9007 | 9007 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1873 | 1873 | | |
1874 | 1874 | | |
1875 | 1875 | | |
| 1876 | + | |
| 1877 | + | |
1876 | 1878 | | |
1877 | 1879 | | |
1878 | 1880 | | |
| |||
5091 | 5093 | | |
5092 | 5094 | | |
5093 | 5095 | | |
| 5096 | + | |
| 5097 | + | |
5094 | 5098 | | |
5095 | 5099 | | |
5096 | 5100 | | |
| |||
8321 | 8325 | | |
8322 | 8326 | | |
8323 | 8327 | | |
| 8328 | + | |
| 8329 | + | |
8324 | 8330 | | |
8325 | 8331 | | |
8326 | 8332 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
| 48 | + | |
| 49 | + | |
54 | 50 | | |
55 | 51 | | |
56 | 52 | | |
| |||
0 commit comments