Merge branch 'test3'

# Conflicts: # 123.txt
个
--- a/123.txt
+++ b/123.txt
@@ -1,6 +1,6 @@
 1
 2
 3
 4
 5
 4
 996
Autors	SHA1	Ziņojums	Datums
刘春山	ea9c7d9708	Merge branch 'test3' # Conflicts: # 123.txt	pirms 4 gadiem
刘春山	188d1f3ea6	个	pirms 4 gadiem