From 0c5e8d446b2f53125d53d5f48e6bb32b6a4d42b5 Mon Sep 17 00:00:00 2001
From: "Robin E. R. Davies" <rerdavies@gmail.com>
Date: Mon, 20 Apr 2026 00:23:09 -0400
Subject: [PATCH] Merge back to 'dev' branch.

---
 vite/src/pipedal/VuMeter.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vite/src/pipedal/VuMeter.tsx b/vite/src/pipedal/VuMeter.tsx
index 80bdec8..e30c126 100644
--- a/vite/src/pipedal/VuMeter.tsx
+++ b/vite/src/pipedal/VuMeter.tsx
@@ -200,8 +200,8 @@ interface VuMeterProps extends WithStyles<typeof styles> {
     instanceId: number;
     display: "input" | "output";
     theme: Theme;
-<<<<<<< HEAD
     height?: number;
+
     displayText?: boolean;
 }