[deploy] 4.1.4 and Firefox 99.0-1 with browser tags and update latest tag

jamesmortensen · jamesmortensen · commit cc94298ad872 · 2022-04-29T07:08:04.000+05:30
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
@@ -2,13 +2,8 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-<<<<<<< HEAD
 FROM seleniarm/base:4.1.3-20220331
 LABEL authors=SeleniumHQ,sj26,jamesmortensen
-=======
-FROM selenium/base:4.1.4-20220427
-LABEL authors=SeleniumHQ
->>>>>>> 379c1ff51523d6ac236f1331de7261c0c732451e
 
 USER root
 
