From 0042db7130e5f92513dc069c89d72acc1d6dbf2b Mon Sep 17 00:00:00 2001
From: Martijn Vermaat <martijn@vermaat.name>
Date: Tue, 1 Dec 2015 00:17:14 +0100
Subject: [PATCH] Update program
---
README.md | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 2caf277..aed783f 100644
--- a/README.md
+++ b/README.md
@@ -35,17 +35,15 @@ GitLab server and using Git for data analysis projects.
| 09:00 | [Introduction](/uploads/c16e25cadec825ca79a768825f5e64a2/introduction.pdf) | Jeroen Laros | Welcome, GitLab overview, SSH keys |
| 09:30 | [Practical](/uploads/59500f585b0b5f06ce4464375f2104a9/introduction_handouts.pdf) | | |
| 09:45 | [Git basics](http://bit.ly/lumc_git_basics) | Wibowo Arindrarto | Basic Git command line fu |
-| 10:30 | *Practical* | | |
+| 10:30 | [Practical](/uploads/5590b3f6eb6976d92b4d153b906543b3/basics_handouts.pdf) | | |
| 11:00 | Coffee | | |
-| 11:15 | **Git and remote repositories** | Martijn Vermaat | Sharing and collaborating via GitLab |
-| 11:45 | *Practical* | | |
+| 11:15 | [Git and remote repositories](/uploads/fae0409963d991c25221843288ed3368/remotes.pdf) | Martijn Vermaat | Sharing and collaborating via GitLab |
| 12:00 | Lunch | | |
-| 13:00 | *Practical* | | |
-| 13:30 | **Combining changes by merging** | Martijn Vermaat | Resolving merge conflicts, protected branches |
-| 14:15 | *Practical* | | |
+| 13:00 | [Practical](/uploads/bd5d6574d2534d3a7afaf3d43bf70aaf/remotes_handouts.pdf) | | |
+| 13:30 | [Combining changes by merging](/uploads/89a6d236332f607b1c091448836efc87/merging.pdf) | Martijn Vermaat | Commit graph, merging, resolving merge conflicts |
+| 14:15 | [Practical](/uploads/b9649d50b3146eaf4632efc80f143f54/merging_handouts.pdf) | | |
| 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon Kiełbasa | More GitLab, Markdown, data analysis use case |
-| 15:30 | *Practical* | | |
| 16:00 | Questions, drinks | | |
@@ -107,4 +105,4 @@ First clone this repository, then fetch the data from the submodule:
A new presentation can be added like this:
cd presentation
- bash mkpres.sh ../mypresentation
\ No newline at end of file
+ bash mkpres.sh ../mypresentation
--
GitLab