From e14dbfc9ad15563cb771714a852412698a41b8ef Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Thu, 29 Jan 2026 11:24:18 -0600
Subject: [PATCH] Fix merge conflict in HlrLookupResult

---
 .../telephony/hlrlookup/HlrLookupCarrierDataProviderTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupCarrierDataProviderTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupCarrierDataProviderTest.java
index d0eb18844..f3eb4be52 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupCarrierDataProviderTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupCarrierDataProviderTest.java
@@ -224,7 +224,7 @@ class HlrLookupCarrierDataProviderTest {
   @MethodSource
   void isPorted(final String isPortedString, final Optional<Boolean> expectedIsPortedValue) {
     final HlrLookupResult hlrLookupResult =
-        new HlrLookupResult("NONE", "NOT_AVAILABLE", null, "NOT_AVAILABLE", null, "MOBILE", isPortedString);
+        new HlrLookupResult("NONE", 1.0f, "NOT_AVAILABLE", null, "NOT_AVAILABLE", null, "MOBILE", isPortedString);
 
     assertEquals(expectedIsPortedValue, HlrLookupCarrierDataProvider.isPorted(hlrLookupResult.isPorted()));
   }