From 4e1a13330028b57818ece6741e029ebdbc9c7572 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Sat, 7 Apr 2018 15:20:50 -0400
Subject: Documentation

---
 base/src/main/java/bjc/utils/parserutils/StringDescaper.java | 2 ++
 1 file changed, 2 insertions(+)

(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 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());
 
 	/*
-- 
cgit v1.2.3