fixed conflicts

This commit is contained in:
2022-04-27 16:56:16 +02:00
28 changed files with 1286 additions and 997 deletions

View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file.
* @details
* Contains 116 translations.
* Generated on: 2022-04-18 16:58:07
* Generated on: 2022-04-27 16:45:35
*/
#include "translateObjects.h"