From 2c08a70398de2fc395007770fabd07a563163cee Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Thu, 31 Oct 2024 15:21:19 +0100
Subject: [PATCH] fix: merge conflict

---
 i18n/en.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 3bf61c0a7f..119326b5e6 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-31T13:00:13.039Z\n"
-"PO-Revision-Date: 2024-10-31T13:00:13.039Z\n"
+"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
+"PO-Revision-Date: 2024-10-25T18:18:11.518Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."