fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit

This commit is contained in:
2022-03-28 10:10:01 +02:00
55 changed files with 2703 additions and 2637 deletions

View File

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 169 translations.
* @details
* Generated on: 2022-03-25 18:53:13
* Generated on: 2022-03-28 09:51:17
*/
#include "translateEvents.h"