Skip to content

Commit

Permalink
Fixed a glitch
Browse files Browse the repository at this point in the history
  • Loading branch information
@hindol
hindol committed Oct 6, 2012
1 parent dc7b57e commit b859dbf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion SOLVING-MERGE-CONFLICTS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Example conflict,
$ git merge rose\'s-version

> 'Auto-merging TEXT`
> `Auto-merging TEXT`
> `CONFLICT (content): Merge conflict in TEXT`
> `Automatic merge failed; fix conflicts and then commit the result.`
Expand Down

0 comments on commit b859dbf

Please sign in to comment.