From f62e865635febb1c2f8f07fe88a00a6fabb15ff0 Mon Sep 17 00:00:00 2001
From: "eline.brader" <eline.brader@nedap.com>
Date: Thu, 14 Dec 2023 13:44:56 +0100
Subject: [PATCH] Merge main and fix conflicts

---
 i18n/po/keys.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/po/keys.pot b/i18n/po/keys.pot
index f99bab6d0..82b49724b 100644
--- a/i18n/po/keys.pot
+++ b/i18n/po/keys.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-11 10:42+0100\n"
+"POT-Creation-Date: 2023-12-14 13:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"