fix: merge conflicts

2025-11-25 22:21:31 +10:00 · 2024-11-15 10:50:31 +00:00
parent adcdf2df58 876803b5db
commit beafc366f7
326 changed files with 23969 additions and 3005 deletions
--- a/packages/lib/translations/es/common.po
+++ b/packages/lib/translations/es/common.po
--- a/packages/lib/translations/es/marketing.po
+++ b/packages/lib/translations/es/marketing.po
@ -8,7 +8,13 @@ msgstr ""
 "Language: es\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "PO-Revision-Date: \n"
+||||||| 7fc497a64
+"PO-Revision-Date: 2024-10-22 02:25\n"
+=======
+"PO-Revision-Date: 2024-11-12 05:45\n"
+>>>>>>> main
 "Last-Translator: \n"
 "Language-Team: \n"
 "Plural-Forms: \n"
--- a/packages/lib/translations/es/web.po
+++ b/packages/lib/translations/es/web.po