Merge branch 'fuheng_branch'

# Conflicts: # doc/fuheng.txt
2 years ago · 32ac3ea6d1
parent ecccf5acd6 bb9aa24278
commit 32ac3ea6d1
1 changed files with 3 additions and 1 deletions
--- a/doc/fuheng.txt
+++ b/doc/fuheng.txt
@ -1,2 +1,4 @@
 111main
+111branch
 222
+333