From 8634af55b57ded2ea8f16c45ef91118615cc86d5 Mon Sep 17 00:00:00 2001 From: Greg Brail Date: Sun, 18 Aug 2024 12:16:02 -0700 Subject: [PATCH] Fix merge conflict resolution error --- .../java/org/mozilla/javascript/ArrayLikeAbstractOperations.java | 1 + 1 file changed, 1 insertion(+) diff --git a/rhino/src/main/java/org/mozilla/javascript/ArrayLikeAbstractOperations.java b/rhino/src/main/java/org/mozilla/javascript/ArrayLikeAbstractOperations.java index 456f9b9e1d..5f6e416a5a 100644 --- a/rhino/src/main/java/org/mozilla/javascript/ArrayLikeAbstractOperations.java +++ b/rhino/src/main/java/org/mozilla/javascript/ArrayLikeAbstractOperations.java @@ -119,6 +119,7 @@ public static Object iterativeMethod( if (ScriptRuntime.toBoolean(result)) return elem; break; case FIND_INDEX: + case FIND_LAST_INDEX: if (ScriptRuntime.toBoolean(result)) return ScriptRuntime.wrapNumber((double) i); break;