remove conflict

vaadin · Nov 15, 2024 · 14b2148 · 14b2148
1 parent 9717409
commit 14b2148
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/communication/ServerRpcHandler.java b/flow-server/src/main/java/com/vaadin/flow/server/communication/ServerRpcHandler.java
@@ -569,7 +569,6 @@ private static void callErrorHandler(UI ui, JsonObject invocationJson,
         ui.getSession().getErrorHandler().error(event);
     }
 
-<<<<<<< HEAD
     protected String getMessage(Reader reader) throws IOException {
 
         StringBuilder sb = new StringBuilder(
@@ -587,8 +586,6 @@ protected String getMessage(Reader reader) throws IOException {
         return sb.toString();
     }
 
-=======
->>>>>>> origin/fix/move-blocking-calls-outside-session-lock
     private static Logger getLogger() {
         return LoggerFactory.getLogger(ServerRpcHandler.class.getName());
     }