Merge branch 'fuheng_branch'

# Conflicts: # doc/fuheng.txt
2 years ago · 865c84e4b1
parent 8438adc846 5a5eb0fcb4
commit 865c84e4b1
1 changed files with 4 additions and 2 deletions
--- a/doc/fuheng.txt
+++ b/doc/fuheng.txt
@ -1,2 +1,4 @@
-111main
-222
+
+111fuheng_branch
+222
+333