From 5aacba062ba35d9a492a354002eb4c5f04713462 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 8 Feb 2022 18:38:48 -0800 Subject: [PATCH] Resolved remaining conflict markers. --- java/core/src/main/java/com/google/protobuf/ByteString.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/core/src/main/java/com/google/protobuf/ByteString.java index 6aae17c9d0..cd270ed52b 100644 --- a/java/core/src/main/java/com/google/protobuf/ByteString.java +++ b/java/core/src/main/java/com/google/protobuf/ByteString.java @@ -316,13 +316,8 @@ public abstract class ByteString implements Iterable, Serializable { }; /** -<<<<<<< HEAD - * Returns a {@link Comparator} which compares {@link ByteString}-s lexicographically - * as sequences of unsigned byte values between 0 and 255, inclusive. -======= * Returns a {@link Comparator} which compares {@link ByteString}-s lexicographically as sequences * of unsigned bytes (i.e. values between 0 and 255, inclusive). ->>>>>>> refs/tags/sync-piper * *

For example, {@code (byte) -1} is considered to be greater than {@code (byte) 1} because it * is interpreted as an unsigned value, {@code 255}: