[gtk+] Fix a merge conflict

From: Matthias Clasen <matthiasc src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtk+] Fix a merge conflict
Date: Thu, 3 Sep 2009 01:41:54 +0000 (UTC)

commit 36a73586cea7783c06aa6eab08751b1abf58c8c1
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 2 21:39:36 2009 -0400

    Fix a merge conflict

 po/hu.po |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/po/hu.po b/po/hu.po
index 28edaa5..48723de 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"

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]