From 6dcd129a10af0034b38bfe843d223c4593deee09 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 12 Nov 2020 20:05:01 -0500 Subject: Cleanup part 2 --- base/src/main/java/bjc/utils/parserutils/StringDescaper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/src/main/java/bjc/utils/parserutils/StringDescaper.java') diff --git a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java index f8868e6..7052588 100644 --- a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java +++ b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; /** - * <<<<<<< Updated upstream Customizable string escapes. + * Customizable string escapes. * * @author Benjamin Culkin */ -- cgit v1.2.3