summaryrefslogtreecommitdiff
path: root/po/hu.po
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-09-02 21:39:36 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-09-02 21:39:36 -0400
commit36a73586cea7783c06aa6eab08751b1abf58c8c1 (patch)
tree3f1bad2b2bcd7a3a255d9805af75db29530a4a16 /po/hu.po
parent4e6e46d621f128c3756b476a8d4b3a540c0df285 (diff)
downloadgtk+-36a73586cea7783c06aa6eab08751b1abf58c8c1.tar.gz
Fix a merge conflict
Diffstat (limited to 'po/hu.po')
-rw-r--r--po/hu.po1
1 files changed, 0 insertions, 1 deletions
diff --git a/po/hu.po b/po/hu.po
index 28edaa5385..48723de678 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5168,7 +5168,6 @@ msgstr "a nyomtató nem érhető el"
#. SUN_BRANDING
#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
->>>>>>> 2.17.10
msgid "ready to print"
msgstr "nyomtatásra kész"