Merge branch 'dev1'

# Conflicts: # first_1.py
dev1冲突
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")
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	84c17f072c	dev1冲突	2 years ago
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	8bedfa233c	Merge branch 'master' into dev1 # Conflicts: # first_1.py	2 years ago
$LAPTOP-VCAAV4VU\zs_hello$ LAPTOP-VCAAV4VU\zs_hello	a1624149fc	dev1 冲突大象	2 years ago