Fix upstream conflicts in rounds

Author: lv0325-dz

make/conf/github-actions.conf

@@ -31,13 +31,9 @@ JTREG_VERSION=7.5.2+1
 
 LINUX_X64_BOOT_JDK_FILENAME=openjdk-17.0.6_linux-x64_bin.tar.gz
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-<<<<<<< HEAD
-LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c
-=======
 LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.19%2B10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.19_10.tar.gz
 LINUX_X64_BOOT_JDK_SHA256=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331
->>>>>>> jdk-17.0.20+8
+
 
 MACOS_AARCH64_BOOT_JDK_FILENAME=openjdk-17.0.6_macos-aarch64_bin.tar.gz
 MACOS_AARCH64_BOOT_JDK_EXT=tar.gz