Merge branch 'dev_tone3000' of https://github.com/rerdavies/pipedal into dev

2026-04-20 00:22:58 -04:00
parent 9827152037 fdee3fa231
commit 705fc9d67e
8 changed files with 240 additions and 176 deletions
@@ -200,6 +200,7 @@ interface VuMeterProps extends WithStyles<typeof styles> {
    instanceId: number;
    display: "input" | "output";
    theme: Theme;
+<<<<<<< HEAD
    height?: number;
    displayText?: boolean;
 }