rebase from mnml mistakes source

_posts/teaching/2022-10-15-android.md

@@ -1,5 +1,6 @@
 ---
 layout: single
+<<<<<<< HEAD
 title: "MSP Android Course"
 categories: teaching
 tags: teaching android java kotlin mobile-development app-development agile teamwork
@@ -55,4 +56,44 @@ Emphasis was placed on applying software engineering best practices within the c
   </ul>
   </div>
   <div style="clear: both;"></div>
-</div>
+</div>
+=======
+title:  "Android - Mobile App Developement"
+categories: teaching 
+tags: app developement  
+excerpt: "Teaching to plan and develope distributed mobile apps for Android as a team."
+header:
+  teaser: assets/images/teaching/android.png
+---
+
+![logo](\assets\images\teaching\android.png){: .align-left style="padding:0.1em; width:5em"}
+Over the course of several semesters me and my collegues tought mobile app developement at [LMU](https://www.mobile.ifi.lmu.de/).
+The lab was divided into two phases:
+**1)** In the introductory phase, the theoretical basics were taught in a weekly preliminary meeting, in addition to practical timeslots.
+**2)** During the project phase, students then worked independently in groups on their own projects.
+There were individual appointments with the project groups to discuss the respective status of the project work.
+
+### Content
+
+<div class="table-right">
+
+| Summer semester | Winter semester |
+|       ---       |       ---       |
+| [2022](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-sose22/) | [2022](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-ws2223/)|
+| [2021](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-sose21/) | [2021](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-ws2122/)|
+| [2020](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-sose20/) | [2020](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-ws2021/)|
+| [2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/msp-sose19/)                                    | [2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/praktikum-mobile-und-verteilte-systeme-ws1920/)|
+|                                                   ---                                                    | [2018](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/msp-ws1819/)|
+
+</div>
+- Developement of Android-Apps
+- Client-Server Architecture
+- Usage of wireless lokal networks (Wifi / Bluetooth)
+- GPS and outdoor positioning
+- Teamwork and planning of timed projects
+- Agile feature developement and tools
+
+&nbsp;
+
+This course was held as `Praktikum Mobile und Verteilte Systeme (MSP)`
+>>>>>>> d0fa738f (rebase from mnml mistakes source)