diff --git a/README.md b/README.md index c90bd7a..5ff7e10 100644 --- a/README.md +++ b/README.md @@ -324,8 +324,7 @@ To see all the remotes that you have access to, type 'git remote -v'. ---------------------------------------------------------------------- #### I git pulled and now I have a konflict. What do I do? - -Fix it. The error messinge tells you which files contain the konflict. +Fix it. The error messinge tells you which files contain the conflict. Open them in an editor and search for the string '>>>>>>'. Just like in svn, the portion of code between this string and the '======' mark is the remote version, while