From 67cbe195117c3e8778995571703c477c0fdcb7ce Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Wed, 24 Feb 2021 16:54:57 -0500
Subject: [PATCH] rebase hiccup

---
 h2/src/main/org/h2/mvstore/db/NullValueDataType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h2/src/main/org/h2/mvstore/db/NullValueDataType.java b/h2/src/main/org/h2/mvstore/db/NullValueDataType.java
index e165fd13ce..7de312b2e3 100644
--- a/h2/src/main/org/h2/mvstore/db/NullValueDataType.java
+++ b/h2/src/main/org/h2/mvstore/db/NullValueDataType.java
@@ -33,7 +33,7 @@ public int compare(Value a, Value b) {
     }
 
     @Override
-    public int binarySearch(Value key, Object storage, int size, int initialGuess) {
+    public int binarySearch(Value key, Object storage, int size) {
         return 0;
     }