Merge branch 'master' of https://github.com/bitfocus/companion-module-yamaha-rcp

Author: MeestorX

yarn.lock

@@ -638,7 +638,11 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+<<<<<<< HEAD
 braces@^3.0.3:
+=======
+braces@^3.0.2:
+>>>>>>> f3fea4982018f38d0a8f50683b6bdc4d68aecb3d
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==