Commit 808342cc authored by Vincent Kirchner's avatar Vincent Kirchner
Browse files

Test vom Test vom Test

:)
parent ed8a22ed
......@@ -14,7 +14,11 @@ int PayloadPeriodicTask::performOneShotAction() {
}
int PayloadPeriodicTask::performPeriodicAction() {
<<<<<<< Updated upstream
VOR_CInfo("Hello World\n\r");
=======
VOR_CInfo("Hello Daniel\n\r");
>>>>>>> Stashed changes
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