From 47db3ada014a27f2a2f34763158446c2255bd448 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Thu, 7 Jun 2007 23:47:01 +0000
Subject: [PATCH] fix openbox.pot, merge from trunk

---
 po/openbox.pot | 4 ----
 1 file changed, 4 deletions(-)

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"
-- 
2.39.2