diff options
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, 2 insertions, 0 deletions
diff --git a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java index fb6fe8f..e8c340a 100644 --- a/base/src/main/java/bjc/utils/parserutils/StringDescaper.java +++ b/base/src/main/java/bjc/utils/parserutils/StringDescaper.java @@ -13,11 +13,13 @@ import static java.util.Map.Entry; import static bjc.utils.PropertyDB.getRegex; /** +<<<<<<< Updated upstream * Customizable string escapes. * * @author Benjamin Culkin */ public class StringDescaper { + /* The logger. */ private Logger LOGGER = Logger.getLogger(StringDescaper.class.getName()); /* |