Merge back to 'dev' branch.

This commit is contained in:
Robin E. R. Davies
2026-04-20 00:23:09 -04:00
parent 705fc9d67e
commit 0c5e8d446b
+1 -1
View File
@@ -200,8 +200,8 @@ interface VuMeterProps extends WithStyles<typeof styles> {
instanceId: number;
display: "input" | "output";
theme: Theme;
<<<<<<< HEAD
height?: number;
displayText?: boolean;
}