Address merge conflicts

openrewrite · Oct 10, 2024 · 61ef772 · 61ef772
2 parents 66cbbc4 + efc2480
commit 61ef772
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java b/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
@@ -80,4 +80,4 @@ public Consumer<Throwable> getOnError() {
     public BiConsumer<Throwable, ExecutionContext> getOnTimeout() {
         return onTimeout;
     }
-}
+}