From d0e17efd0fb27ffd2909d1e570f87d992a1472e7 Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Wed, 11 Sep 2019 10:31:55 +0200
Subject: [PATCH] fix formatting

---
 2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md | 2 +-
 2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
index ec8b72da..baeb3790 100644
--- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
+++ b/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
diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md
index 63bff91d..99778645 100644
--- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md
+++ b/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.
 
-- 
GitLab