source: documentation/trunk/packages/dokuwiki-2011-05-25a/inc/lang/zh/conflict.txt@ 25027

Last change on this file since 25027 was 25027, checked in by jmt12, 12 years ago

Adding the packages directory, and within it a configured version of dokuwiki all ready to run

  • Property svn:mime-type set to application/octet-stream
File size: 346 bytes
Line 
1====== 存圚䞀䞪曎新的版本 ======
2
3悚猖蟑的文档存圚䞀䞪曎新的版本。这种情
4况的发生是因䞺圚悚猖蟑时有及䞀䞪甚户曎改了该文档。
5
6请仔细检查䞋面列出的差别并决定保留哪䞪版本。劂果悚选择“保存”悚的版本将被保留。点击“取消”将保留圓前版本。
Note: See TracBrowser for help on using the repository browser.