fix

b4841f40 · Karsa Zoltán István · 5069b23e · b4841f40
Commit b4841f40 authored Mar 05, 2023 by Karsa Zoltán István
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

circle/locale/hu/LC_MESSAGES/django.po
+0 -6

No files found.
--- a/circle/locale/hu/LC_MESSAGES/django.po
+++ b/circle/locale/hu/LC_MESSAGES/django.po
@@ -699,13 +699,7 @@ msgstr "E-mail értesítések"
 msgid "Whether user wants to get digested email notifications."
 msgstr "A felhasználó kéri-e tömbösített e-mail értesítések küldését."
-<<<<<<< HEAD
-#: dashboard/models.py:204
-#, fuzzy
-#| msgid "Latest modifications"
-=======
 #: dashboard/models.py:195
->>>>>>> 4d2c281d9c634f23b856d01444ee968725e6a018
 msgid "Desktop notifications"
 msgstr "Asztali értesítések"