Commit 3ebbcbf
committed
fix: fix things that broke during merge
1 parent a30de72 commit 3ebbcbf
File tree
3 files changed
+23
-12
lines changed- tagstudio/src
- core/settings
- qt
- modals
3 files changed
+23
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
38 | 39 | | |
39 | 40 | | |
40 | 41 | | |
41 | | - | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
70 | 82 | | |
| 83 | + | |
71 | 84 | | |
| 85 | + | |
72 | 86 | | |
73 | 87 | | |
74 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
321 | 321 | | |
322 | 322 | | |
323 | 323 | | |
324 | | - | |
325 | | - | |
326 | | - | |
| 324 | + | |
327 | 325 | | |
328 | | - | |
| 326 | + | |
329 | 327 | | |
330 | 328 | | |
331 | 329 | | |
| |||
382 | 380 | | |
383 | 381 | | |
384 | 382 | | |
385 | | - | |
| 383 | + | |
386 | 384 | | |
387 | 385 | | |
388 | 386 | | |
| |||
426 | 424 | | |
427 | 425 | | |
428 | 426 | | |
429 | | - | |
| 427 | + | |
430 | 428 | | |
431 | 429 | | |
432 | 430 | | |
| |||
595 | 593 | | |
596 | 594 | | |
597 | 595 | | |
598 | | - | |
| 596 | + | |
599 | 597 | | |
600 | 598 | | |
601 | 599 | | |
| |||
915 | 913 | | |
916 | 914 | | |
917 | 915 | | |
918 | | - | |
919 | | - | |
920 | | - | |
| 916 | + | |
921 | 917 | | |
922 | 918 | | |
923 | 919 | | |
| |||
0 commit comments