boe/simonsays_2425
1
0
Fork 2
forked from BKI/simonsays_2425
Code Pull requests 1 Activity

fixed merge error

Browse source
This commit is contained in:
Samuel Zimmerer 2025-07-08 15:06:24 +02:00
parent 0ee27ec6ad
commit 9d40af67ea
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SimonSaysProgramm/SimonSaysProgramm.ino
View file

@ -55,11 +55,8 @@ void loop() {
break; break;
case 3: // Vergleich Eingabe/Ausgabe case 3: // Vergleich Eingabe/Ausgabe
//Gruppe 4 start =============================================================================== //Gruppe 4 start ===============================================================================
<<<<<<< HEAD
//Samuel Zimmerer //Samuel Zimmerer
=======
//Jan Fink //Jan Fink
>>>>>>> finkja-main
//Gruppe 4 ende ================================================================================ //Gruppe 4 ende ================================================================================
@ -79,4 +76,4 @@ void loop() {
//Gruppe 6 ende ================================================================================ //Gruppe 6 ende ================================================================================
break; break;
} }
} }