Skip to content

Commit

Permalink
提交解决冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
@souvckeji
souvckeji committed Jul 20, 2017
1 parent df808b1 commit 8712505
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ git push -u origin master

```java

代码，代码，修改代码
代码，代码，修改了代码，冲突了

```

Expand Down

0 comments on commit 8712505

Please sign in to comment.