From f4423c55e1cff5352d8b31cd3619b04038ea7049 Mon Sep 17 00:00:00 2001 From: Loes <l.bogers@hva.nl> Date: Tue, 1 Oct 2019 15:14:01 +0200 Subject: [PATCH] updated header --- docs/assignments/week01.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assignments/week01.md b/docs/assignments/week01.md index 59a7851..4acfd37 100644 --- a/docs/assignments/week01.md +++ b/docs/assignments/week01.md @@ -103,7 +103,7 @@ Yes! I had my first conflicting commit between the remote repository and my loca Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. [This support page](https://help.github.com/en/articles/resolving-a-merge-conflict-on-github) was helpful. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay! -*conflicting commits!* +*conflicts resolved!* -- GitLab