From b22f5e7aa7dd6be3924a9c08335f301f27750b7d Mon Sep 17 00:00:00 2001
From: Mihai <m.lefter@lumc.nl>
Date: Fri, 1 Sep 2017 16:30:24 +0200
Subject: [PATCH] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7e264f5..d59fc6b 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Details for the next session:
 | 13:00 | [Collaboration: remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf)   | Jonathan Vis   | Sharing and collaborating via remotes |
 | 13:45 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf)             |                   |                           |
 | 14:15 | Break                                                                                  |                   |                           |
-| 14:30 | [Collaboration: combining changes by merging](/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf)  | Mihai Lefter   | Commit graph, merging, resolving merge conflicts |
+| 14:30 | [Collaboration: combining changes by merging](/uploads/1bc6dc39f8c0234264b3efbbd596ccbe/merging.pdf)  | Mihai Lefter   | Commit graph, merging, resolving merge conflicts |
 | 15:15 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf)            |                   |                           |
 | 15:45 | Break                                                                                  |                   |                           |
 | 16:00 | [Extras]()  | Mihai Lefter   | GitLab, GitHub, Markdown, ... |
-- 
GitLab