Merge branch 'master' of https://github.com/hawkiyc/git_demo

* 'master' of https://github.com/hawkiyc/git_demo: Update new_feature.txt # Conflicts: # new_feature.txt
hawkiyc · Jun 19, 2024 · ba54ecb · ba54ecb
2 parents 49fe326 + 08d86ac
commit ba54ecb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/new_feature.txt b/new_feature.txt
@@ -3,3 +3,4 @@ new feature for beta 0.1
 new feature for beta 0.2 from remote team
 new feature for beta 0.3 from remote master
 new feature for beta 0.4 from local master
+new feature for beta 0.4.1 from remote master