User: pjanik  
Date: 05/06/29 07:58:34

Modified:
 /cs/po/helpcontent2/source/text/scalc/
  guide.po

Log:
 fix CVS conflict

File Changes:

Directory: /cs/po/helpcontent2/source/text/scalc/
=================================================

File [changed]: guide.po
Url: 
http://cs.openoffice.org/source/browse/cs/po/helpcontent2/source/text/scalc/guide.po?r1=1.76&r2=1.77
Delta lines:  +0 -4
-------------------
--- guide.po    29 Jun 2005 14:54:08 -0000      1.76
+++ guide.po    29 Jun 2005 14:58:31 -0000      1.77
@@ -6,11 +6,7 @@
 msgstr ""
 "Project-Id-Version: guide\n"
 "POT-Creation-Date: 2002-07-15 17:13+0100\n"
-<<<<<<< guide.po
-"PO-Revision-Date: 2005-06-29 15:19+0200\n"
-=======
 "PO-Revision-Date: 2005-06-29 16:20+0200\n"
->>>>>>> 1.75
 "Last-Translator: Martin Jinoch <[EMAIL PROTECTED]>\n"
 "Language-Team: Czech <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to