From 467646d61373825260fece59e46a2afaf748d79f Mon Sep 17 00:00:00 2001
From: iaforek <arkadiusz@jaworski.pl>
Date: Tue, 16 May 2017 15:32:16 +0100
Subject: [PATCH] BAEL-838 Removed unresolved conflict.

---
 core-java/src/main/java/com/baeldung/string/StringHelper.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/string/StringHelper.java b/core-java/src/main/java/com/baeldung/string/StringHelper.java
index adf8d70531..ad2a0b3419 100644
--- a/core-java/src/main/java/com/baeldung/string/StringHelper.java
+++ b/core-java/src/main/java/com/baeldung/string/StringHelper.java
@@ -21,10 +21,6 @@ public class StringHelper {
     public static String removeLastCharRegexOptional(String s) {
         return Optional.ofNullable(s)
             .map(str -> str.replaceAll(".$", ""))
-<<<<<<< HEAD
             .orElse(s);
-=======
-            .orElse(null);
->>>>>>> refs/remotes/eugenp/master
     }
 }