pam_winbind/ro.po: fix error from previous patch merge

fixes up d619a57 BUG: https://bugzilla.samba.org/show_bug.cgi?id=14491 Signed-off-by: Bjoern Jacke <[email protected]> Reviewed-by: Björn Baumbach <[email protected]> Autobuild-User(master): Björn Jacke <[email protected]> Autobuild-Date(master): Thu Oct 29 20:49:16 UTC 2020 on sn-devel-184
Roo4L · Oct 29, 2020 · e8f31e5 · e8f31e5
1 parent 9214fce
commit e8f31e5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po
@@ -557,6 +557,3 @@ msgstr ""
 #: ../../libsmb/nterr.c:649
 msgid "No more files"
 msgstr ""
-=======
-msgstr "Извините, пароли не совпадают"
->>>>>>> s3: update Russian translation of pam_winbind