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

Merge remote-tracking branch 'origin/wersja_zdalna_2' into edycja_8

Browse Source 
# Conflicts:
#	projekt_wyklad_6_freertos/main.c
This commit is contained in:
Zbigniew Kulesza 2022-06-04 18:31:46 +02:00
commit c198de7476
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
projekt_wyklad_6_freertos/main.c
View File

@ -286,24 +286,35 @@ int main(void)
//{ //{
// for(;;);// user code here // for(;;);// user code here
//} //}
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// komentarz 30 i 40 // komentarz 30 i 40
======= =======
// komentarz 3 i 4 oraz 5 // komentarz 3 i 4 oraz 5
>>>>>>> wersja_5 >>>>>>> wersja_5
=======
<<<<<<< HEAD
// komentarz zdalna edycja 5
>>>>>>> origin/wersja_zdalna_2
//ISR(BADISR_vect) //ISR(BADISR_vect)
//{ //{
// for(;;);// user code here // for(;;);// user code here
//} //}
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// komentarz 300 i 400 // komentarz 300 i 400
=======
// komentarz zdalna edycja 6 po galezi
>>>>>>> origin/wersja_zdalna_2
//ISR(BADISR_vect) //ISR(BADISR_vect)
//{ //{
// for(;;);// user code here // for(;;);// user code here
//} //}
<<<<<<< HEAD
// komentarz 3000 i 4000 // komentarz 3000 i 4000
======= =======
// komentarz 3 i 4 oraz 5 i 6 // komentarz 3 i 4 oraz 5 i 6
@ -311,4 +322,13 @@ int main(void)
//ISR(BADISR_vect) //ISR(BADISR_vect)
//{ //{
// for(;;);// user code here // for(;;);// user code here
//} //}
=======
// komentarz zdalna edycja 7 po galezi zdalnej 2
//ISR(BADISR_vect)
//{
// for(;;);// user code here
//}
=======
>>>>>>> 271502b08d2c496d81b2476277453e44ad52af4b
>>>>>>> origin/wersja_zdalna_2