Commit c8b48c76 authored by Vermaat's avatar Vermaat
Browse files

Preliminary version of merging lecture

parent 6b2439ab
......@@ -41,7 +41,7 @@ GitLab server and using Git for data analysis projects.
| 11:45 | *Practical* | | |
| 12:00 | Lunch | | |
| 13:00 | *Practical* | | |
| 13:30 | **Git conflicts** | Martijn Vermaat | Resolving merge conflicts, protected branches |
| 13:30 | **Combining changes by merging** | Martijn Vermaat | Resolving merge conflicts, protected branches |
| 14:15 | *Practical* | | |
| 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon M. Kiełbasa | More GitLab, Markdown, data analysis use case |
......
../presentation/Makefile
\ No newline at end of file
../presentation/beamerthemelumc.sty
\ No newline at end of file
../presentation/gen2phen_logo.eps
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment