fix conflict

dragonwell-project · Oct 21, 2024 · db19e7e · db19e7e
1 parent 7603aed
commit db19e7e
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
@@ -25,28 +25,21 @@
 
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
-<<<<<<< HEAD
 BOOT_JDK_VERSION=17
-GTEST_VERSION=1.8.1
-=======
 GTEST_VERSION=1.13.0
->>>>>>> jdk-17.0.13+9
 JTREG_VERSION=7.3.1+1
 
 LINUX_X64_BOOT_JDK_FILENAME=openjdk-17.0.6_linux-x64_bin.tar.gz
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 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
 
-<<<<<<< HEAD
 WINDOWS_X64_BOOT_JDK_FILENAME=openjdk-17.0.6_windows-x64_bin.zip
 WINDOWS_X64_BOOT_JDK_EXT=zip
 WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_windows_hotspot_17.0.11_9.zip
 WINDOWS_X64_BOOT_JDK_SHA256=fdd6664d4131370398fbc8bfbb7b46dbfec4a22a090a511fe5c379dae188c390
 
 MACOS_X64_BOOT_JDK_FILENAME=openjdk-17.0.6_macos-x64_bin.tar.gz
-=======
->>>>>>> jdk-17.0.13+9
 MACOS_X64_BOOT_JDK_EXT=tar.gz
 MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz
 MACOS_X64_BOOT_JDK_SHA256=f8b96724618f4df557c47f11048d1084e98ed3eb87f0dbd5b84f768a80c3348e