From: Dana Jansens <danakj@orodu.net>
Date: Thu, 7 Jun 2007 23:47:01 +0000 (+0000)
Subject: fix openbox.pot, merge from trunk
X-Git-Tag: release-3.4.3~92
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=47db3ada014a27f2a2f34763158446c2255bd448;p=dana%2Fopenbox.git

fix openbox.pot, merge from trunk
---

diff --git a/po/openbox.pot b/po/openbox.pot
index db4da69c..00cbc398 100644
--- a/po/openbox.pot
+++ b/po/openbox.pot
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-<<<<<<< .working
-"POT-Creation-Date: 2007-06-05 16:46-0400\n"
-=======
 "POT-Creation-Date: 2007-06-07 14:18+0200\n"
->>>>>>> .merge-right.r7434
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"