fix: merge conflict

dhis2 · Oct 31, 2024 · 2c08a70 · 2c08a70
1 parent 1ea2f3f
commit 2c08a70
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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..."