[BUGFIX] Remove duplicated command

pixelbrackets · pixelbrackets · commit 4bea9d1b7b53 · 2013-10-25T15:52:11.000+02:00
diff --git a/git_cheat_sheet.md b/git_cheat_sheet.md
@@ -242,13 +242,12 @@
 
 ## Merge
 
-* View merge conflicts
+* Merge a branch into your current HEAD
 
 		git merge <branch>
 
-* Merge a branch into your current HEAD
+* Manually solve conflicts and mark file as resolved
 
-		git merge <branch>
 
 * Use a merge tool to solve conflicts
 
