From 41bb86ab37d53f6ebcaae95ae4acd0184f2123c6 Mon Sep 17 00:00:00 2001
From: Wryn Wagner <wagner.wryn@gmail.com>
Date: Wed, 16 Sep 2020 20:22:29 -0600
Subject: [PATCH] dictionary merge conflict resolution

---
 vim/en.utf-8.add     |   2 +-
 vim/en.utf-8.add.spl | Bin 1009 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 vim/en.utf-8.add.spl

diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add
index a1e1aa1..0ef16fb 100644
--- a/vim/en.utf-8.add
+++ b/vim/en.utf-8.add
@@ -77,5 +77,5 @@ BCT
 CBAT
 BCAT
 ACBT
-Haitao/!
 Haitao
+tex
diff --git a/vim/en.utf-8.add.spl b/vim/en.utf-8.add.spl
deleted file mode 100644
index b226cf32ac1e8665d4db1eb301321b786bc455ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1009
zcmY*XJ8s)R5akRV*MSOm28$Hx1A(OgBb9?VMT(?eQY&er<u0*HiK42UAx#btz(?>Y
zQu{j2n_*xe&3<Oyym|BadjF7n>;3zeqTpXQrfD~JyW6|(2j7L*r#zg-%bTVRX`q4l
zil``V8#3f+g27QshMAX?i5cGk=7Rak0}}8va3G|fO4H)525R{*KYB_Osb>>u2b_>a
z!LGyq|2i<Nw??C`O%r08)Y2rRaI__>Db8{Nwnciper67tPJmc&L*5S@@*EUxRV;9I
zqz3kciX!03^_a@-eiB?|Ag!YwXu&4n6ftHxf@zO(dz|n+CAN}a13?k65rIjAHcHgt
z7ZC*Lh@z*`<q-^qBKpS*h|}t8PY1!QEQm!`uRJ0`#KTgeznO8sB`N@3cK}^b0p8OD
zn@s086HSg?oFf79DC7bb3EGr4jVM0I?^$g0QL-BOuX1Uu<3YF#Kw?_X1+9+k!;E?e
zNaJRPdPirC7Cx$MiI6|r*dy2@qnujdi=I^rvI|-_SAAkTz|aENL#(tal*JN6ce+69
z44bSJNUMyU;SsM|XTI`S7-^NxXfoHW3lYL~EYC+cJJ2~yW~Q@Hg4b`4Ne%F6z10~6
z{1!4BHBb(v-8(kY7v>#gA?BS2%A)O}duG|_WHOj!Mi8~`(Yd3_G03T+*6l3)snaOt
zLuozuz9dbT!RVk9(T@QOAw}+Vc`6x4D~@_!U<CZ(8^;M`C;AK_ve*SEr20>g^lyI`
QBC?@7cwdPZ0r5rg7j+@Jf&c&j