www/philosophy/po misinterpreting-copyright.zh-...

[DENG Nan]

CVSROOT:        /web/www
Module name:    www
Changes by:     DENG Nan <monnand>      10/08/27 01:12:14

Modified files:
        philosophy/po  : misinterpreting-copyright.zh-cn.po 

Log message:
        Confliction Solved

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.zh-cn.po?cvsroot=www&r1=1.12&r2=1.13

Patches:
Index: misinterpreting-copyright.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.zh-cn.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- misinterpreting-copyright.zh-cn.po  27 Aug 2010 01:10:43 -0000      1.12
+++ misinterpreting-copyright.zh-cn.po  27 Aug 2010 01:12:12 -0000      1.13
@@ -6,13 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misinterpreting-copyright.html\n"
-<<<<<<< misinterpreting-copyright.zh-cn.po
 "POT-Creation-Date: 2010-07-16 04:25-0300\n"
 "PO-Revision-Date: 2010-08-26 21:31+0300\n"
-=======
-"POT-Creation-Date: 2010-08-21 04:25-0300\n"
-"PO-Revision-Date: 2010-07-13 14:31+0300\n"
->>>>>>> 1.11
 "Last-Translator: Deng, Nan <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh\n"