Merge branch 'master' of http://10.10.10.60:3000/Followind/TestGit · 5fcbd1f399 - TestGit - Followind

Merge branch 'master' of http://10.10.10.60:3000/Followind/TestGit

# Conflicts:
#	README.md

master

sanwen 5 years ago

parent

ebebdee9bd 204af6e0bd

commit

5fcbd1f399

2 changed files with 3 additions and 1 deletions

Unified View Show Diff Stats

						
							+ 2
							
							- 1
						
README.mdView File
								
														For Practice Git operation.
														
														For Practice Git operation.
													
														Git is a distributed version control system.
														
														Git is a distributed version control system.
													
														Git is free software distributed under the GPL.
														
														Git is free software distributed under the GPL.
													
														Creating a new branch is quick and simple
														
														Creating a new branch is quick and simple
													
														The bug has been fixed.
														
														The bug has been fixed.
													
														Add some modifications
														
														Add some modifications

						
							+ 1
							
							- 0
						
test.txtView File
								
														ddd