fix merge

opendocument-app · Dec 26, 2024 · 5ae0973 · 5ae0973
1 parent 7aac172
commit 5ae0973
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
@@ -1,14 +1,7 @@
-<<<<<<< Updated upstream
-FROM ubuntu:24.04
-
-ENV FIREFOX_VERSION="133.0"
-ENV CHROME_VERSION="131.0.6778.241"
-=======
 FROM --platform=linux/amd64 ubuntu:24.04
 
 ENV FIREFOX_VERSION="133.0"
-ENV CHROME_VERSION="131.0.6778.205"
->>>>>>> Stashed changes
+ENV CHROME_VERSION="131.0.6778.241"
 ENV PHANTOMJS_VERSION="2.1.1"
 ENV GECKODRIVER_VERSION="0.35.0"