view .svn/pristine/0f/0f6a1a5f91b1625dba02a90214d3f1e2572096f8.svn-base @ 1528:5047f066734d live

Fix merge failure in de.yml
author Chris Cannam
date Fri, 26 Sep 2014 10:18:42 +0100
parents 261b3d9a4903
children
line wrap: on
line source
--- a.txt	2013-04-05 14:19:39.000000000 +0900
+++ b.txt	2013-04-05 14:19:51.000000000 +0900
@@ -1,3 +1,3 @@
 aaaa
-日本
+日本語
 bbbb