Merge branch 'master' into dev1

# Conflicts: # first_1.py
dev2 冲突袋鼠
1 changed files with 2 additions and 1 deletions
--- a/first_1.py
+++ b/first_1.py
@ -10,4 +10,5 @@ class A:
        print("test")
        print("修改一下")
        print("分支dev1, 提交")
-        print("大象")
+        print("分支dev2, 内容提交")
+        print("袋鼠")
Author	SHA1	Message	Date
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	8bedfa233c	Merge branch 'master' into dev1 # Conflicts: # first_1.py	3 years ago
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	e5be48419f	dev2 冲突袋鼠	3 years ago
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	1bacfb2e43	dev2 提交	3 years ago