Mercurial > hg > maven

diff cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.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 49cfb0252aa2
line wrap: on
line diff
--- a/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.sha1	Mon Apr 10 18:00:07 2017 +0900
+++ b/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.sha1	Fri Jul 07 20:13:56 2017 +0900
@@ -1,1 +1,3 @@
-308a147eac492d8955e6822382f23c870074ba46
\ No newline at end of file
+<<<<<<< local
+00f4c07edc9b9972e3c77db69b314dd1fc59be92=======
+308a147eac492d8955e6822382f23c870074ba46>>>>>>> other