resolve conflicts

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
opensearch-project · Apr 25, 2024 · 4b345ab · 4b345ab
1 parent d91eb48
commit 4b345ab
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/indices/IndicesRequestCache.java b/server/src/main/java/org/opensearch/indices/IndicesRequestCache.java
@@ -245,7 +245,6 @@ BytesReference getOrCompute(
         } else {
             cacheEntity.onHit();
         }
-
         return value;
     }