Commit 298da48
committed
rebase to main, remove conflicting commit
1 parent c2ad2dd commit 298da48
File tree
2 files changed
+9
-1
lines changed- examples/text_labels_and_annotations
- lib/matplotlib
2 files changed
+9
-1
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3119 | 3119 | | |
3120 | 3120 | | |
3121 | 3121 | | |
| 3122 | + | |
| 3123 | + | |
| 3124 | + | |
| 3125 | + | |
| 3126 | + | |
| 3127 | + | |
| 3128 | + | |
| 3129 | + | |
3122 | 3130 | | |
3123 | 3131 | | |
3124 | 3132 | | |
| |||
0 commit comments