fix formatting

2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md

@@ -7,7 +7,7 @@ $ git checkout develop
 $ git checkout -b changeMichael
 ```
 
-Change Michael file...
+Change Michael file...  
 
 ```bash
 $ git fetch upstream

2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md

@@ -11,6 +11,6 @@ A conflict should emerge
 $ git mergetool
 ```
 
-* This opens kdiff3 if it was properly set up. Selecting A will keep the changes of the target branch, 
+* This opens kdiff3 if it was properly set up. Selecting A will keep the changes of the target branch,  
 while B will keep your changes. Selecting A and B will combine both changes to the merged file.