diff --git a/readme.txt b/readme.txt index 624c86d..16f7746 100644 --- a/readme.txt +++ b/readme.txt @@ -2,3 +2,5 @@ Git is a distributed version control system. Git is free software distributed under the GPL.. Creating a new branch is quick + +delete conflict