Merge remote-tracking branch 'remotes/origin/lj'

# Conflicts: # 山居秋暝.txt
4 months ago · fd2b88680d
parent 3edace131d 11debebebf
commit fd2b88680d
1 changed files with 2 additions and 1 deletions
--- a/山居秋暝.txt
+++ b/山居秋暝.txt
@ -1,2 +1,3 @@
 空山新雨后，天气晚来秋。
-明月松间照，清泉石上流。
+明月松间照，清泉石上流。
+竹喧归浣女，莲动下渔舟。