Mercurial > hg > maven

diff cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.sha1 @ 130:206fb7db07eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add Alice 1.1. moved to /var/www/html/maven
author suruga
date Fri, 07 Jul 2017 20:13:56 +0900
parents 2984ffbba945
children fc32d5c0e2a6
line wrap: on
line diff
--- a/cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.sha1	Mon Apr 10 18:00:07 2017 +0900
+++ b/cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.sha1	Fri Jul 07 20:13:56 2017 +0900
@@ -1,1 +1,3 @@
-1126c20d0f85a42311de52be6eef42ec325d4e11
\ No newline at end of file
+<<<<<<< local
+de297371db54f369afdd536e059c2cbae7858b73=======
+1126c20d0f85a42311de52be6eef42ec325d4e11>>>>>>> other