view .svn/pristine/a2/a2df3b427a668a9b7e89ac99fd87ef2e91829150.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents 261b3d9a4903
children
line wrap: on
line source
--- a.txt	2013-07-27 04:20:45.973229414 +0900
+++ b.txt	2013-07-27 04:20:52.366228105 +0900
@@ -1,3 +1,3 @@
 aaaa
-日本記
+日本誘
 bbbb