diff options
| author | Ben Culkin <scorpress@gmail.com> | 2020-11-12 20:05:01 -0500 |
|---|---|---|
| committer | Ben Culkin <scorpress@gmail.com> | 2020-11-12 20:05:01 -0500 |
| commit | 6dcd129a10af0034b38bfe843d223c4593deee09 (patch) | |
| tree | e27cf2574a10da36d9a737e1fef48da8e5681da8 /base/src/main/java/bjc/utils/parserutils/StringDescaper.java | |
| parent | c41cfde634d70c3a50adf3979cc5239e5ae52e73 (diff) | |
Cleanup part 2
Diffstat (limited to 'base/src/main/java/bjc/utils/parserutils/StringDescaper.java')
| -rw-r--r-- | base/src/main/java/bjc/utils/parserutils/StringDescaper.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |