X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=a72ac4da29db04f7c23826bd116228d28745203c;hb=c76ecf7085499b8d32f1624764f547e639d103d9;hp=c79777fc7ae1e836c3202257731c00a7f78e6638;hpb=1d3e5272a80d5890a3618912e6799f436dc2911b;p=mkjsf-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index c79777f..a72ac4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.indexdata</groupId>
@@ -53,7 +52,7 @@
     <dependency>
       <groupId>com.indexdata</groupId>
       <artifactId>masterkey-common</artifactId>
-      <version>0.1.10</version>
+      <version>0.1.36</version>
     </dependency>
   </dependencies>
   <build>
@@ -126,7 +125,7 @@
     </repository>
     <site>
       <id>id-website</id>
-      <url>scpexe://www.indexdata.com/var/www/software/mkjsf/</url>
+      <url>scpexe://www.indexdata.com/var/www/software/mkjsf/project/</url>
     </site>
   </distributionManagement>  
   <repositories>