fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
This commit is contained in:
@ -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"
|
||||
|
||||
|
Reference in New Issue
Block a user