zjk/pw5f
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://zjk.pl:3300/zjk/pw5f into wersja_zdalna_2

Browse Source
This commit is contained in:
Zbigniew Kulesza 2022-06-03 19:41:57 +02:00
commit 061a7e669e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projekt_wyklad_6_freertos/main.c
View File

@ -286,6 +286,7 @@ int main(void)
//{ //{
// for(;;);// user code here // for(;;);// user code here
//} //}
<<<<<<< HEAD
// komentarz zdalna edycja 5 // komentarz zdalna edycja 5
//ISR(BADISR_vect) //ISR(BADISR_vect)
@ -303,4 +304,6 @@ int main(void)
//ISR(BADISR_vect) //ISR(BADISR_vect)
//{ //{
// for(;;);// user code here // for(;;);// user code here
//} //}
=======
>>>>>>> 271502b08d2c496d81b2476277453e44ad52af4b