Merge remote branch 'origin/v2.3'

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

diff --git a/po/ca.po b/po/ca.po
index acbfbcce8e263939c14022aef86a4aba16a3a09d..31bacb835f283a42662cab2f6acd7a8214a0cf6b 100644 (file)
--- a/po/ca.po
+++ b/po/ca.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 ""