Merge branch 'dev1'

# Conflicts: # first_1.py
1 year ago · e8b7beaa9a
parent a66e6b4b77 84c17f072c
commit e8b7beaa9a
1 changed files with 1 additions and 0 deletions
--- a/first_1.py
+++ b/first_1.py
@ -13,3 +13,4 @@ class A:
        print("分支dev2, 内容提交")
        print("袋鼠")
        print("dt")
+        print("ct")