summaryrefslogtreecommitdiff
path: root/corpus/support
diff options
context:
space:
mode:
Diffstat (limited to 'corpus/support')
-rw-r--r--corpus/support/token_list1
1 files changed, 1 insertions, 0 deletions
diff --git a/corpus/support/token_list b/corpus/support/token_list
index 69dbfdc2..00daa82b 100644
--- a/corpus/support/token_list
+++ b/corpus/support/token_list
@@ -48,6 +48,7 @@ vrt.
ym.
yms.
yo.
+>>>>>>> 8646b68e5b124f612fd65b51ea40624f65a2f3d6
# hindi abbreviation patterns
जन.