Skip to content

Commit

Permalink
format readme markdown list
Browse files Browse the repository at this point in the history
  • Loading branch information
@liubin
liubin committed Sep 25, 2015
1 parent 8d848b7 commit 7a865a5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

Git冲突时的解决方法

[Resolving merge conflicts](https://help.github.com/articles/resolving-merge-conflicts/)
[Resolving a merge conflict from the command line](https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/)
- [Resolving merge conflicts](https://help.github.com/articles/resolving-merge-conflicts/)
- [Resolving a merge conflict from the command line](https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/)

0 comments on commit 7a865a5

Please sign in to comment.