Mercurial > hg > maven

diff cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml @ 133:49cfb0252aa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Alice
author suruga
date Wed, 26 Jul 2017 16:33:48 +0900
parents 206fb7db07eb
children c150cf0da040
line wrap: on
line diff
--- a/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml	Mon Jul 10 17:35:18 2017 +0900
+++ b/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml	Wed Jul 26 16:33:48 2017 +0900
@@ -7,10 +7,6 @@
     <versions>
       <version>1.1</version>
     </versions>
-<<<<<<< local
-    <lastUpdated>20170707110120</lastUpdated>
-=======
-    <lastUpdated>20160214190603</lastUpdated>
->>>>>>> other
+    <lastUpdated>20170726073238</lastUpdated>
   </versioning>
 </metadata>