Merge branch 'master' into develop

personium · Sep 2, 2019 · 5c863f3 · 5c863f3
2 parents 6f70b78 + 3f7d922
commit 5c863f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>io.personium</groupId>
     <artifactId>personium-core</artifactId>
     <packaging>war</packaging>
-    <version>1.7.18_es6.6.1-SNAPSHOT</version>
+    <version>1.7.18_es6.6.1</version>
     <name>personium-core Maven Webapp</name>
     <url>http://maven.apache.org</url>
     <licenses>

diff --git a/src/main/java/io/personium/core/model/impl/fs/DavCmpFsImpl.java b/src/main/java/io/personium/core/model/impl/fs/DavCmpFsImpl.java
@@ -68,6 +68,7 @@
 import io.personium.core.ElapsedTimeLog;
 import io.personium.core.PersoniumCoreException;
 import io.personium.core.PersoniumCoreLog;
+import io.personium.core.ElapsedTimeLog;
 import io.personium.core.PersoniumUnitConfig;
 import io.personium.core.auth.AccessContext;
 import io.personium.core.auth.BoxPrivilege;