merge finished

_posts/teaching/2019-10-15-operating_systems.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Operating Systems TA"
 categories: teaching
 excerpt: "TA & Coordinator, Operating Systems lecture (~350 students), system programming."
@@ -48,31 +47,3 @@ The lecture built upon the foundations laid in [Computer Architecture](/teaching
 </div>
 
   Practical exercises emphasized concurrent programming using Java Threads.
-=======
-title:  "Lecture: Operating Systems"
-categories: teaching 
-excerpt: "Teaching the inner working of bits and bytes."
-header:
-  teaser: assets/images/teaching/computer_os.png
----
-
-![logo](\assets\images\teaching\computer_os.png){: .align-left style="padding:0.1em; width:5em"}In the semesters listed below, my job was to assist in organiszing this bachelors lecture of about 300-400 students.
-We had a team of 10-12 tutors that were employed to balance the workload.
-Also, we created each weeks graded exercise sheets as well as the written exam and organized it.
-
-### Content
-
-<div class="table-right">
-
-| [Winter semester 2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/bs-ws1920/)|
-| [Summer semester 2018](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/bs-ws1819/)|
-
-</div>The lecture `Operating Systems` was a continuation of the lecture [`Computer Architecture`](teaching/computer_achitecture/) held in the summer semester.
-The focus of the lecture lay on presenting the concepts of system programming.
-This included the programming of the operating system and of service programs such as editors, compilers and interpreters.
-The lecture provided an overview of the main tasks and problem around operating system, with particular emphasis on the areas of synchronization, process communication, kernel and memory management.
-Java (in particular the Thread API) was used to teach the practical implementation of the concepts introduced in the lecture in the practical exercises.
-At the end of the lecture, the architecture of distributed systems, cross-computer communication and remote procedure calls was discussed, also.
-
-This lecture was held by Prof. Dr. Linnhoff-Popien titled `Betriebssysteme` at [LMU](https://www.mobile.ifi.lmu.de/).
->>>>>>> d0fa738f (rebase from mnml mistakes source)