Skip to content

Commit

Permalink
conflict fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@blackyao
blackyao committed Jul 21, 2017
2 parents 2e75229 + f70e548 commit d17ead2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Git id a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
Creating a new branch is quick & simple.
Creating a new branch is quick and simple.

0 comments on commit d17ead2

Please sign in to comment.