Skip to content

Commit

Permalink
modify auto
Browse files Browse the repository at this point in the history
  • Loading branch information
@wuxiaoqiang12
wuxiaoqiang12 committed Apr 3, 2019
1 parent d9dd04b commit c9d20d6
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ Git is 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.
<<<<<<< HEAD
Creating a new branch is quick and simple.
=======
Creating a new branch is quick and simple.
>>>>>>> feature1

0 comments on commit c9d20d6

Please sign in to comment.