diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 912719c21e7..1875c014562 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-10-07 23:50+0000\n" +"POT-Creation-Date: 2022-10-10 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16518,14 +16518,6 @@ msgstr "" msgid "pgRouting 3.3.5 Release Notes" msgstr "" -msgid "" -"<<<<<<< HEAD * `#2401 " -"`__:" -msgstr "" - -msgid "pgRouting 3.4.0 do not build docs when sphinx is too low or missing" -msgstr "" - msgid "pgRouting 3.3.4 Release Notes" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 7a30163fa57..bcceb4f8b98 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-10-07 23:50+0000\n" +"POT-Creation-Date: 2022-10-10 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13114,12 +13114,6 @@ msgstr "" msgid "pgRouting 3.3.5 Release Notes" msgstr "" -msgid "<<<<<<< HEAD * `#2401 `__:" -msgstr "" - -msgid "pgRouting 3.4.0 do not build docs when sphinx is too low or missing" -msgstr "" - msgid "pgRouting 3.3.4 Release Notes" msgstr ""