accidentally committed conflict file
accidentally committed conflict file

urbiworx/node-red-contrib-freeboard,skybus-io/node-red-contrib-freeboard,morikat/node-red-contrib-freeboard,urbiworx/node-red-contrib-freeboard,skybus-io/node-red-contrib-freeboard,morikat/node-red-contrib-freeboard