iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAEL-838 Removed unresolved conflict.

Browse Source
This commit is contained in:
iaforek 2017-05-16 15:32:16 +01:00
parent bc6d707976
commit 467646d613
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core-java/src/main/java/com/baeldung/string/StringHelper.java
View File

@ -21,10 +21,6 @@ public class StringHelper {
public static String removeLastCharRegexOptional(String s) { public static String removeLastCharRegexOptional(String s) {
return Optional.ofNullable(s) return Optional.ofNullable(s)
.map(str -> str.replaceAll(".$", "")) .map(str -> str.replaceAll(".$", ""))
<<<<<<< HEAD
.orElse(s); .orElse(s);
=======
.orElse(null);
>>>>>>> refs/remotes/eugenp/master
} }
} }