Commit bb2a42e
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 doc
- patch-d6d69aeb: Remove duplicate FedCmLoginGooglePatch and FedCmLoginPatch entries1 parent 0283d54 commit bb2a42e
3 files changed
Lines changed: 14 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8832 | 8832 | | |
8833 | 8833 | | |
8834 | 8834 | | |
8835 | | - | |
| 8835 | + | |
8836 | 8836 | | |
8837 | 8837 | | |
8838 | 8838 | | |
| |||
9013 | 9013 | | |
9014 | 9014 | | |
9015 | 9015 | | |
9016 | | - | |
| 9016 | + | |
9017 | 9017 | | |
9018 | 9018 | | |
9019 | 9019 | | |
| |||
28813 | 28813 | | |
28814 | 28814 | | |
28815 | 28815 | | |
28816 | | - | |
| 28816 | + | |
28817 | 28817 | | |
28818 | 28818 | | |
28819 | 28819 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1888 | 1888 | | |
1889 | 1889 | | |
1890 | 1890 | | |
1891 | | - | |
1892 | | - | |
1893 | 1891 | | |
1894 | 1892 | | |
1895 | 1893 | | |
| |||
3250 | 3248 | | |
3251 | 3249 | | |
3252 | 3250 | | |
3253 | | - | |
3254 | | - | |
3255 | 3251 | | |
3256 | 3252 | | |
3257 | 3253 | | |
| |||
4312 | 4308 | | |
4313 | 4309 | | |
4314 | 4310 | | |
4315 | | - | |
4316 | 4311 | | |
4317 | 4312 | | |
4318 | 4313 | | |
| |||
5147 | 5142 | | |
5148 | 5143 | | |
5149 | 5144 | | |
5150 | | - | |
5151 | | - | |
5152 | 5145 | | |
5153 | 5146 | | |
5154 | 5147 | | |
| |||
7581 | 7574 | | |
7582 | 7575 | | |
7583 | 7576 | | |
7584 | | - | |
7585 | 7577 | | |
7586 | 7578 | | |
7587 | 7579 | | |
| |||
8416 | 8408 | | |
8417 | 8409 | | |
8418 | 8410 | | |
8419 | | - | |
8420 | | - | |
8421 | 8411 | | |
8422 | 8412 | | |
8423 | 8413 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
38 | 47 | | |
| 48 | + | |
| 49 | + | |
39 | 50 | | |
40 | 51 | | |
41 | 52 | | |
| |||
0 commit comments