fixup! build(deps): bump ubi8/openjdk-17-runtime in /src/container (#…

…1943)
cryostatio · Jun 10, 2024 · 821a797 · 821a797
1 parent 77af0c2
commit 821a797
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/container/Dockerfile b/src/container/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18-2
-=======
 FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-2
->>>>>>> 103901b8 (build(deps): bump ubi8/openjdk-17-runtime in /src/container (#1943))
 
 USER root