chore: unblocking stuck kokoro test

Dhriti Chopra · Dhriti Chopra · commit 06d2634fe4a6 · 2026-01-27T16:52:50.000+05:30
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadResponse.java
@@ -23,5 +23,10 @@
  *
  * @since 2.60.0
  */
+<<<<<<< HEAD
 @JacksonXmlRootElement(localName = "AbortMultipartUploadResponse")
 public final class AbortMultipartUploadResponse {}
+=======
+public final class AbortMultipartUploadResponse {
+}
+>>>>>>> be5395a5 (chore: unblocking stuck kokoro test)
