A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
intl: fix strings with '<<< HEAD' in pseudo-LOCALE.po (#9236)
01zulfi44a7aed3088a
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.poindex f6e75c1d1..db0d47aa1 100644--- a/packages/intl/locale/pseudo-LOCALE.po+++ b/packages/intl/locale/pseudo-LOCALE.po@@ -749,7 +749,7 @@ msgstr ""#: src/strings.ts:975msgid "Add your first notebook"-msgstr "<<<<<<< HEAD"+msgstr ""#: src/strings.ts:2617msgid "Adjust the line height of the editor"@@ -1603,7 +1603,7 @@ msgstr ""#: src/strings.ts:2392msgid "Click to reset {title}"-msgstr "<<<<<<< HEAD"+msgstr ""#: src/strings.ts:2615msgid "Click to save"@@ -2591,7 +2591,7 @@ msgstr ""#: src/strings.ts:120msgid "Enter the recovery code to continue logging in"-msgstr "<<<<<<< HEAD"+msgstr ""#: src/strings.ts:2618msgid "Enter title"@@ -3556,7 +3556,7 @@ msgstr ""#: src/strings.ts:2356msgid "Line {line}, Column {column}"-msgstr "<<<<<<< HEAD"+msgstr ""#: src/strings.ts:2616msgid "Line height"@@ -7488,7 +7488,7 @@ msgstr ""#: src/strings.ts:1403msgid "Your free trial is ending soon"-msgstr "<<<<<<< HEAD"+msgstr ""#: src/strings.ts:2622msgid "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"