Fixing missed merge conflics (#275)

* tag with :beta

* Adding more tags

* Fix missed merge conflict

* Another missed merge conflict

Author: hardillb

.docker/Dockerfile.alpine

@@ -33,11 +33,7 @@ RUN set -ex && \
 WORKDIR /usr/src/node-red
 
 # Setup SSH known_hosts file
-<<<<<<< HEAD
-COPY known_hosts.sh .
-=======
 COPY .docker/known_hosts.sh .
->>>>>>> aa66343d764cc4f200ec7fbef0f01afeb1d82d5c
 RUN ./known_hosts.sh /etc/ssh/ssh_known_hosts && rm /usr/src/node-red/known_hosts.sh
 
 # package.json contains Node-RED NPM module and node dependencies