address merge conflicts

Author: mpeddada1

.kokoro/presubmit/graalvm-native-a.cfg

@@ -1,14 +1,5 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Configure the docker image for kokoro-trampoline.
-<<<<<<< Updated upstream
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.11.3"
-}
-=======
->>>>>>> Stashed changes
-
 env_vars: {
   key: "JOB_TYPE"
   value: "graalvmA"

.kokoro/presubmit/graalvm-native-b.cfg

@@ -1,15 +1,6 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Configure the docker image for kokoro-trampoline.
 env_vars: {
-<<<<<<< Updated upstream
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.11.3"
-}
-
-env_vars: {
-=======
->>>>>>> Stashed changes
   key: "JOB_TYPE"
   value: "graalvmB"
 }
@@ -34,10 +25,7 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
-<<<<<<< Updated upstream
-=======
 
 container_properties {
   docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.11.3"
 }
->>>>>>> Stashed changes

renovate.json

@@ -19,13 +19,7 @@
       "fileMatch": [
         "^.kokoro/presubmit/graalvm-native.*.cfg$"
       ],
-<<<<<<< Updated upstream
-      "matchStrings": [
-        "value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""
-      ],
-=======
       "matchStrings": ["docker_image: \"us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm.*:(?<currentValue>.*?)\""],
->>>>>>> Stashed changes
       "depNameTemplate": "com.google.cloud:native-image-shared-config",
       "datasourceTemplate": "maven"
     }