Commit e3ace42
committed
resolve conficts
1 parent a064451 commit e3ace42
3 files changed
Lines changed: 17 additions & 1 deletion
File tree
- dashboard/src/assets/mdi-subset
Lines changed: 17 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
328 | 328 | | |
329 | 329 | | |
330 | 330 | | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
331 | 335 | | |
332 | 336 | | |
333 | 337 | | |
| |||
552 | 556 | | |
553 | 557 | | |
554 | 558 | | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
555 | 563 | | |
556 | 564 | | |
557 | 565 | | |
| |||
732 | 740 | | |
733 | 741 | | |
734 | 742 | | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
735 | 747 | | |
736 | 748 | | |
737 | 749 | | |
| |||
1044 | 1056 | | |
1045 | 1057 | | |
1046 | 1058 | | |
| 1059 | + | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
1047 | 1063 | | |
1048 | 1064 | | |
1049 | 1065 | | |
| |||
Binary file not shown.
Binary file not shown.
0 commit comments