Remove merge tags from the po files

A merge conflict in the po files must have gone unnoticed and the conflict
tags were committed. They have now been removed.

diff --git a/po/bg.po b/po/bg.po
index e10cdfe96fbda305a0088c9257ed2b5ad36726e2..50dc688924e6b507194d9c246a5688d89174f747 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/ca.po b/po/ca.po
index 31bacb835f283a42662cab2f6acd7a8214a0cf6b..829dd7603dc7d3b1e3c18220cbdf67f3d5a9abca 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/cs.po b/po/cs.po
index fd10776818a0daf562931f146db324734c0c9e01..a2dc80c828469e2b14a07304bf7fb74af579460e 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/de.po b/po/de.po
index 615932c1c8079586ad6f03010578ecf768610f67..32cb927ab74768ad89f0b99c51a0f577bf13938f 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/el.po b/po/el.po
index e142cfb668b6c1860fe56906052186adc1b98beb..eb7ae18b26c85c0b501799b9e8f4ab0134716c91 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/es.po b/po/es.po
index 0bc44a508146ace396afaeb384728a53b5b2b2a7..98bfad058b7a3e30c98b02ff8cd300a0138be45a 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -1537,11 +1537,7 @@ 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 ""

diff --git a/po/hu.po b/po/hu.po
index fb11fa874099c2a7af9ee6670ab77ffa36c41eba..82ef54a2db1c81e96f0a29720518525e1bcb7b10 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/id.po b/po/id.po
index 77afa1333b28b9c850418ff54b4a132fc91ec8d7..68db3ae910f5820ad336d372590fb5700a802663 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/it.po b/po/it.po
index c335d9230d22a7ff17af34463d8161893713c12f..07f5006223400fa5b638511676312b68b174f265 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/ja.po b/po/ja.po
index 3422fd3d64d7e89854857f7671fec0b33e1d4c3b..87a37ef61d9c1d4fd1385fe42f8acb8b20ed262b 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/lv.po b/po/lv.po
index 2822e2632d8e6de680ce7d1468669bd2116765b3..5e2ac0caef49763a750d805a002f2c7ad6f5f24b 100644 (file)
--- a/po/lv.po
+++ b/po/lv.po
@@ -1540,11 +1540,7 @@ 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 ""

diff --git a/po/nl.po b/po/nl.po
index 43c3f96cbea6eaf2500732d6bf0b2ef7d23a9358..ce123a76915342abab4a6e3b2f6c684fe28457de 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -1538,11 +1538,7 @@ 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 ""

diff --git a/po/pl.po b/po/pl.po
index 6f44aaa4ef00470ff4b8eb6c0076ef227891bac6..925152b8d8cb6e00f3c95afe2435be94a5254e69 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1547,15 +1547,7 @@ 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 ""

diff --git a/po/pt.po b/po/pt.po
index 382c99b3b1531ac74bc115a8f00156b801013900..eebf30e78967bbe0026743333d750efe8c6cf884 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/ro.po b/po/ro.po
index 8188822225762d4218774480c8faed59b784505a..a3d651ec01f5d928d0b31de8c0432e793fe22e61 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/ru.po b/po/ru.po
index b1ccff374e91e540c11700118500422d36abee91..e8f764044d217b27c86d4d27f93ea885910b5b35 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1509,11 +1509,7 @@ msgstr "Версия sarg: %s\n"
 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 ""

diff --git a/po/sk.po b/po/sk.po
index f9c729834ca026e54cb6b243165fc1e4c61dcade..78a9f375b03bd1188f81960dc82a25d15b5f3c68 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/sr.po b/po/sr.po
index f790d0ccaf45d201666da9bf4da79c9770d83b14..0a445dd25291d83fe64aa32558540aa15cf962dd 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/tr.po b/po/tr.po
index b90bd871bfdde74cabdd49584353cf6969511bb8..ee8961f346b4e9cb96298de25986e7aa5f1565e7 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1536,11 +1536,7 @@ 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 ""

diff --git a/po/uk.po b/po/uk.po
index 9257eaab4e552c5651347f246c83a578eac5c77f..3f03cb01eac65ad825a0d2645f5245bd34018e05 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -1535,11 +1535,7 @@ 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 ""