Merge branch 'dev1'

# Conflicts: # first_1.py
dev2 ct
1 changed files with 1 additions and 0 deletions
--- a/first_1.py
+++ b/first_1.py
@ -12,4 +12,5 @@ class A:
        print("分支dev1, 提交")
        print("分支dev2, 内容提交")
        print("袋鼠")
+        print("dt")
        print("ct")
Author	SHA1	Message	Date
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	e8b7beaa9a	Merge branch 'dev1' # Conflicts: # first_1.py	2 years ago
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	a66e6b4b77	dev2 ct	2 years ago