cleanup

Barlerer · Oct 16, 2017 · 951c5a7 · 951c5a7
1 parent 0852a2e
commit 951c5a7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/additional-material/resolving-merge-conflicts.md b/additional-material/resolving-merge-conflicts.md
@@ -17,6 +17,7 @@ eg:
  =======
  This is a fourth line I am adding
  >>>>>>> 4e2b407f501b68f8588aa645acafffa0224b9b78:mergetest
+```
 
 <<<<<<<: Indicates the start of the lines that had a merge conflict. The first set of lines are the lines from the file that you were trying to merge the changes into.
 =======: Indicates the break point used for comparison. Breaks up changes that user has committed (above) to changes coming from merge (below) to visually see the differences.