From 5ae097338074be39aeec718c5c9345abd8e47cb1 Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Thu, 26 Dec 2024 14:09:37 +0100
Subject: [PATCH] fix merge

---
 test/docker/Dockerfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index 456a87f3..9fdbff11 100644
--- 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"