diff options
Diffstat (limited to 'base/src/main/java/bjc/utils/parserutils')
| -rw-r--r-- | base/src/main/java/bjc/utils/parserutils/TokenUtils.java | 4 |
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 |