# HG changeset patch
# User suruga
# Date 1499426036 -32400
# Node ID 206fb7db07eb6f27ef8dd24bf4382b46bc3a0aee
# Parent  a47b4ec22b76e0651dfe5168f8b8eedd30c13c58
add Alice 1.1.
moved to /var/www/html/maven

diff -r a47b4ec22b76 -r 206fb7db07eb cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar
Binary file cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar has changed
diff -r a47b4ec22b76 -r 206fb7db07eb cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.md5
--- a/cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.md5	Mon Apr 10 18:00:07 2017 +0900
+++ b/cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.md5	Fri Jul 07 20:13:56 2017 +0900
@@ -1,1 +1,3 @@
-2c4c280ef708ab641cb5d4f63da75a48
\ No newline at end of file
+<<<<<<< local
+4e6c130e375909665879480aabc6b7f2=======
+2c4c280ef708ab641cb5d4f63da75a48>>>>>>> other
diff -r a47b4ec22b76 -r 206fb7db07eb cr/ie/u_ryukyu/ac/jp/Alice/1.1/Alice-1.1.jar.sha1
--- 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
diff -r a47b4ec22b76 -r 206fb7db07eb cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml
--- a/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml	Mon Apr 10 18:00:07 2017 +0900
+++ b/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml	Fri Jul 07 20:13:56 2017 +0900
@@ -2,12 +2,15 @@
 <metadata>
   <groupId>cr.ie.u_ryukyu.ac.jp</groupId>
   <artifactId>Alice</artifactId>
-  <version>1.0</version>
   <versioning>
+    <release>1.1</release>
     <versions>
-      <version>1.0</version>
       <version>1.1</version>
     </versions>
+<<<<<<< local
+    <lastUpdated>20170707110120</lastUpdated>
+=======
     <lastUpdated>20160214190603</lastUpdated>
+>>>>>>> other
   </versioning>
 </metadata>
diff -r a47b4ec22b76 -r 206fb7db07eb cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.md5
--- a/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.md5	Mon Apr 10 18:00:07 2017 +0900
+++ b/cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.md5	Fri Jul 07 20:13:56 2017 +0900
@@ -1,1 +1,3 @@
-5c17354f30c0f144ddc6de302a92772d
\ No newline at end of file
+<<<<<<< local
+7e23d151b51c7289cef58e08e94beb67=======
+5c17354f30c0f144ddc6de302a92772d>>>>>>> other
diff -r a47b4ec22b76 -r 206fb7db07eb cr/ie/u_ryukyu/ac/jp/Alice/maven-metadata.xml.sha1
--- 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