fixed merge error
This commit is contained in:
parent
0ee27ec6ad
commit
9d40af67ea
1 changed files with 1 additions and 4 deletions
|
@ -55,11 +55,8 @@ void loop() {
|
|||
break;
|
||||
case 3: // Vergleich Eingabe/Ausgabe
|
||||
//Gruppe 4 start ===============================================================================
|
||||
<<<<<<< HEAD
|
||||
//Samuel Zimmerer
|
||||
=======
|
||||
//Jan Fink
|
||||
>>>>>>> finkja-main
|
||||
|
||||
|
||||
//Gruppe 4 ende ================================================================================
|
||||
|
@ -79,4 +76,4 @@ void loop() {
|
|||
//Gruppe 6 ende ================================================================================
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue