Commit b5606045 authored by Daniel G.'s avatar Daniel G.
Browse files

accepted

parents 742da99b 808342cc
......@@ -14,7 +14,15 @@ int PayloadPeriodicTask::performOneShotAction() {
}
int PayloadPeriodicTask::performPeriodicAction() {
<<<<<<< HEAD
VOR_CInfo("Hello vincent\n\r");
=======
<<<<<<< Updated upstream
VOR_CInfo("Hello World\n\r");
=======
VOR_CInfo("Hello Daniel\n\r");
>>>>>>> Stashed changes
>>>>>>> 808342cc23a581f10fe2a4f34b06bf4810841b2c
return 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment