Skip to content

Commit

Permalink
conflict fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@VBRay
VBRay committed May 9, 2020
2 parents ba23332 + ec33686 commit c4ad9ae
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 @@ -3,4 +3,8 @@ Git is free sofrware distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
Creating a new branch is quick.
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 c4ad9ae

Please sign in to comment.