Auto-merging docker-versions-create.sh

CONFLICT (content): Merge conflict in Dockerfile
Merge branch 'master' into multiarch-latest
2026-02-17 23:16:24 +00:00 · 2021-02-07 09:18:13 -06:00 · 2021-02-06 14:52:49 -06:00
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-jre
+FROM adoptopenjdk:latest

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	e8061c08f7	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:18:13 -06:00
Geoff Bourne	2e085f174c	Merge branch 'master' into multiarch-latest	2021-02-06 14:52:49 -06:00