Skip to content

Commit

Permalink
conflict fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
feifei committed Feb 4, 2015
2 parents 91f0213 + 2ae378b commit 2f51603
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ Git is a distributed version control system.
Git is free software distributed by GPL.
Git has a mutale 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 2f51603

Please sign in to comment.