From c958c68438f256b55a0b9165abb2c538a838c229 Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Mon, 9 Sep 2019 13:19:55 +0200
Subject: [PATCH] fix spacing for conflictPres

---
 2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
index 0da1b19c..de838c80 100644
--- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
+++ b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md
@@ -4,6 +4,7 @@
 
 * Meanwhile a coworker changed that Micheal file in the develop branch
 
-* If you try to push your changes to that file into develop, you'll encounter a merge conflict, the system cannot know which change is now the one to keep.
+* If you try to push your changes to that file into develop, you'll encounter a merge conflict,  
+the system cannot know which change is now the one to keep.
 
 * Usually done using `git diff` in bigger project this method quickly loses oversight
\ No newline at end of file
-- 
GitLab