Compare commits

..

No commits in common. "0ee27ec6adb53301c4a66e5b8b084f1062532914" and "4773f1099c3c161a32631456b5a95bfe132bbde6" have entirely different histories.

2 changed files with 1 additions and 13 deletions

View file

@ -1,8 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
"version": "0.2.0",
"configurations": [
]
}

View file

@ -55,11 +55,7 @@ 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
>>>>>>> finkja-main
//Gruppe 4 ende ================================================================================ //Gruppe 4 ende ================================================================================