From b1f8f6efd69d8a993888ddcda1c73b441b36080a Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Thu, 12 Apr 2018 00:13:50 -0400
Subject: Update

---
 base/src/main/java/bjc/utils/parserutils/TokenUtils.java      | 4 ----
 base/src/main/java/bjc/utils/parserutils/TreeConstructor.java | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'base/src/main/java/bjc/utils/parserutils')

diff --git a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
index 6d27202..7b159af 100644
--- a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
+++ b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
@@ -226,12 +226,8 @@ public class TokenUtils {
 				escapeRep = "\\";
 				break;
 			default:
-<<<<<<< Updated upstream
-				if(escapeSeq.startsWith("u")) {
-=======
 				/* Handle a non-short form escape. */
 				if (escapeSeq.startsWith("u")) {
->>>>>>> Stashed changes
 					escapeRep = handleUnicodeEscape(escapeSeq.substring(1));
 				} else {
 					escapeRep = handleOctalEscape(escapeSeq);
diff --git a/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java b/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java
index 960e61a..64868fd 100644
--- a/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java
+++ b/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java
@@ -26,7 +26,9 @@ public class TreeConstructor {
 	 * 	The token type of the tree.
 	 */
 	public interface QueueFlattener<TokenType> extends Function<Deque<ITree<TokenType>>, ITree<TokenType>> {
-
+		/*
+		 * Alias
+		 */
 	}
 
 	/* Alias for constructor state. */
-- 
cgit v1.2.3