1 changed files with 0 additions and 4 deletions
+ 0
- 4
age.c
View File
| @@ -6,9 +6,5 @@ void setAge(uint8_t age) | |||||
| } | } | ||||
| uint8_t getAge(void) | uint8_t getAge(void) | ||||
| { | { | ||||
| <<<<<<< HEAD | |||||
| return g_age+2; | return g_age+2; | ||||
| ======= | |||||
| return g_age+1; | |||||
| >>>>>>> eaed4014ac38e524085ca2b65097b2cd05ca2ebe | |||||
| } | } | ||||
Loading…