Commit a8892c5
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 regeneration1 parent dd01c8e commit a8892c5
2 files changed
Lines changed: 4 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8814 | 8814 | | |
8815 | 8815 | | |
8816 | 8816 | | |
8817 | | - | |
| 8817 | + | |
8818 | 8818 | | |
8819 | 8819 | | |
8820 | 8820 | | |
| |||
8995 | 8995 | | |
8996 | 8996 | | |
8997 | 8997 | | |
8998 | | - | |
| 8998 | + | |
8999 | 8999 | | |
9000 | 9000 | | |
9001 | 9001 | | |
| |||
| 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