From 36a73586cea7783c06aa6eab08751b1abf58c8c1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 2 Sep 2009 21:39:36 -0400
Subject: [PATCH] Fix a merge conflict

---
 po/hu.po | 1 -
 1 file changed, 1 deletion(-)

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"