Merge remote branch 'origin/v2.3'

[thirdparty/sarg.git] / po / pl.po

diff --git a/po/pl.po b/po/pl.po
index a6895d48fed1d980758bd710f70b4f87e31ed0ad..6fa834ffc71d05d5649c71d9c9bfe055bdfae847 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1547,7 +1547,15 @@ msgstr ""
 msgid "Sarg compiled to report warnings if the output is inconsistent\n"
 msgstr ""
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+#: log.c:740
+=======
+#: log.c:752
+>>>>>>> origin/v2.3
+=======
 #: log.c:761
+>>>>>>> origin/v2.3
 #, c-format
 msgid "setrlimit error - %s\n"
 msgstr ""