dictionary merge conflict resolution

2020-09-16 20:22:29 -06:00 · 2020-09-16 20:22:29 -06:00 · 41bb86ab37
commit 41bb86ab37
parent 0059974336
2 changed files with 1 additions and 1 deletions
--- a/vim/en.utf-8.add
+++ b/vim/en.utf-8.add
@ -77,5 +77,5 @@ BCT
 CBAT
 BCAT
 ACBT
-Haitao/!
 Haitao
+tex
--- a/vim/en.utf-8.add.spl
+++ b/vim/en.utf-8.add.spl