Skip to content

Commit

Permalink
comflict fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@wuxiaoqiang12
wuxiaoqiang12 committed Apr 3, 2019
2 parents b5a2fe7 + 101ec25 commit d9dd04b
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 under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
Creating a new branch is quick & simple.
<<<<<<< HEAD
Creating a new branch is quick and simple.
=======
Creating a new branch is quick and simple.
>>>>>>> feature1

0 comments on commit d9dd04b

Please sign in to comment.