Merge branch 'master' into dev1

# Conflicts: # first_1.py
1 year ago · 8bedfa233c
parent a1624149fc e5be48419f
commit 8bedfa233c
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("袋鼠")