draining

courses/wuv.md

@@ -7,7 +7,7 @@ instructors:
     - frabe
 semesters:
     - SS17
-    -  WS17/18
+    - WS17/18
     - SS18
     - WS18/19
     - SS19
@@ -41,8 +41,13 @@ 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
@@ -76,8 +81,8 @@ auf dem Forum präsent zu sein, und schnell auf Fragen zu antworten. Also das Fo
 abonnieren!
 
 ##### For the record: Seminarplan SS2019
-|Datum|Sprecher|Thema|
-|-----|-------|-----|
+|Datum|Sprecher|Thema|Notiz|
+|-----|-------|-----|-----|
 | 24.4. 2019| Rabe | Admin, Themenvergabe ||
 | 1. 5. 2019 | - | Maifeiertag ||
 | 8. 5. 2019 | Richard Marcus | 3D Visualization of Theory Graphs||
@@ -90,8 +95,8 @@ abonnieren!
 | 26. 6. 2019 | Tom Wiesing | Integrating semantic mathematical documents and dynamic notebooks||
 | 3. 7. 2019 | Jonas Beyer | Morphoid Type Theory||
 | 10. 7. 2019 | - | entfaellt ||
-| *15. 7. 2019, 14:00 | Navid Roux| Refactoring Theory Graphs in KM Systems (Raum 11.139)|Sondertermin|
-| *17. 7. 2019 | Kathrin Horsting| Somthing with WissKI|Cauerstraße 4, Raum 0.332|
+| \*15. 7. 2019, 14:00 | Navid Roux| Refactoring Theory Graphs in KM Systems (Raum 11.139)|Sondertermin|
+| \*17. 7. 2019 | Kathrin Horsting| Somthing with WissKI|Cauerstraße 4, Raum 0.332|
 | 24. 7. 2019 | - | entfaellt ||
 
 

people/dmueller.md

@@ -14,8 +14,8 @@ affiliation: Computer Science, FAU Erlangen-Nürnberg
 website: http://blog.logicalphalluses.net/
 ---
 ### Description
-PostDoc (Thesis 12/2019:
-[Mathematical Knowledge Management Across Formal Libraries](http://gl.kwarc.info/supervision/PhD-archive/mueller_dennis/dmueller_phd.pdf))
+PostDoc (Thesis 10/2019:
+[Mathematical Knowledge Management Across Formal Libraries](https://kwarc.info/people/dmueller/pubs/thesis.pdf))
 
 B.Sc. and M.Sc. in mathematics with focus on model theory and axiomatic set theory from
 University Freiburg.
@@ -23,7 +23,7 @@ University Freiburg.
 Primarily working on knowledge management across systems, libraries and
 foundations. Interested in foundations of mathematics and formal languages.
 
-Currently at University of Innsbruck (1/2020-6/2020), working with [Cezary Kaliscyck](http://cl-informatik.uibk.ac.at/cek/).
+Currently at University of Innsbruck (12/2019-6/2020), working with [Cezary Kaliszyk](http://cl-informatik.uibk.ac.at/cek/).
 
 ### Contact
 Email: "d." + lastname.replace("ü","ue") + "@" + this.domain