From 8f8f7e90ce56631005aabb7ffca7d5d57b359ba5 Mon Sep 17 00:00:00 2001
From: Michael Kohlhase <michael.kohlhase@fau.de>
Date: Tue, 28 Jan 2020 10:03:21 +0100
Subject: [PATCH] merge

---
 courses/wuv.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/courses/wuv.md b/courses/wuv.md
index 20c010e..ed18248 100644
--- a/courses/wuv.md
+++ b/courses/wuv.md
@@ -41,13 +41,8 @@ die Arbeitsgruppe einzusteigen (z.B. für eine Master-Arbeit oder Promotion).
 | 18. 12. 2019 | Christoph Alt | Formula Search for the nLab| 
 |  8.  1. 2020 | ---  | no seminar | 
 | 15.  1. 2020 | Takuto Asakura (NII Tokyo) | Towards Grounding of Formulae in Mathematical Objects| 
-<<<<<<< HEAD
 | 22.  1. 2020 | Navid Roux | Composition of programming languages | 
 | 29.  1. 2020 | -- | no seminar | 
-=======
-| 22.  1. 2020 | Navid Roux | Composing Programming Languages| 
-| 29.  1. 2020 | Lorenz Oberhauser| Curry Howard Isomorphism| 
->>>>>>> 4e0a80c2e74d354ff7f1c1bf78ce1f39074d4c86
 |  5.  2. 2020 | Max Rapp| ALMANAC and on | 
 
 ##### Vortragsthemen
-- 
GitLab