Merge remote branch 'origin/v2.3'

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

diff --git a/po/bg.po b/po/bg.po
index 2ab8aa0362ccb294720f3f88e240c2f4b75d6e4e..e10cdfe96fbda305a0088c9257ed2b5ad36726e2 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -1536,7 +1536,11 @@ msgstr ""
 msgid "Sarg compiled to report warnings if the output is inconsistent\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: log.c:740
+=======
 #: log.c:761
+>>>>>>> origin/v2.3
 #, c-format
 msgid "setrlimit error - %s\n"
 msgstr ""