BAEL-838 Removed unresolved conflict.

2017-05-16 15:32:16 +01:00 · 2017-05-16 15:32:16 +01:00 · 467646d613
commit 467646d613
parent bc6d707976
1 changed files with 0 additions and 4 deletions
--- 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
    }
 }