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

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file.
* @details
* Contains 117 translations.
* Generated on: 2022-03-25 18:53:22
* Generated on: 2022-03-28 09:51:13
*/
#include "translateObjects.h"