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

fixes up d619a57804d200e351b509d67a8c76042cb9daa8

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14491

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Björn Baumbach <bbaumbach@samba.org>
Autobuild-User(master): Björn Jacke <bjacke@samba.org>
Autobuild-Date(master): Thu Oct 29 20:49:16 UTC 2020 on sn-devel-184

diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po
index 24c482be46b83a6b6034c7ded741afba7eecb966..1c2ff904be87cbf9921f0770bdcf350ccf814bc6 100644 (file)
--- 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