summaryrefslogtreecommitdiff
path: root/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
diff options
context:
space:
mode:
authorBenjamin J. Culkin <bjculkin@mix.wvu.edu>2018-09-17 16:20:21 -0300
committerBenjamin J. Culkin <bjculkin@mix.wvu.edu>2018-09-17 16:20:21 -0300
commitecbe7abdde7198adcd13034f110dd675fa096a63 (patch)
tree112ef4a01009c4b16f16eb430dcf794740680ac4 /base/src/main/java/bjc/utils/parserutils/TokenUtils.java
parent72186c677da15390cf63e65270e918524a2c6107 (diff)
Add more features to ReportWriter
This adds both an ability to get the column at which the indent ended, as well as some basic page control.
Diffstat (limited to 'base/src/main/java/bjc/utils/parserutils/TokenUtils.java')
-rw-r--r--base/src/main/java/bjc/utils/parserutils/TokenUtils.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
index c1a68a8..bcce97e 100644
--- a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
+++ b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java
@@ -69,11 +69,7 @@ public class TokenUtils {
* Splits a string around instances of java-style double-quoted strings.
*
* @param inp
-<<<<<<< Updated upstream
* The string to split.
-=======
- * The string to split.
->>>>>>> Stashed changes
*
* @return
* An list containing alternating bits of the string and the embedded double-quoted