Merge branch 'beta' of github.com:bs10081/Rime-Cx330 into beta

bs10081 · Feb 3, 2021 · 1182d86 · 1182d86
2 parents 952c91f + 792bd51
commit 1182d86
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/custom_phrase.txt b/custom_phrase.txt
@@ -123,7 +123,10 @@ Microsoft	weiruan	3
 巨硬	weiruan	2
 柴妹    chaimei 1
 柴妹    idmw    1
+<<<<<<< HEAD
 BiliBili    bilibili    1
+=======
+>>>>>>> 792bd51fee547e43dfdf99460e42079e5925e051