Merge branch 'main' of https://github.com/mshulman/signalK-fusion-volume into main

mshulman · mshulman · commit 18409dfddf21 · 2021-07-25T01:36:04.000-07:00
diff --git a/Fusion_volume_control.ino b/Fusion_volume_control.ino
@@ -1,5 +1,10 @@
 /*
   mshulman@gmail.com
+<<<<<<< HEAD
+=======
+  25-Jul-2021
+  
+>>>>>>> 4f960e9bcd5ac04250da9c102de19424b24956c4
   Subscribe to the SignalK server and get the volume control settings
   for all zones
 
