This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c9b302b962609adce0dd3fd63658a002eea6f4b7 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 7 09:12:27 2016 +0200 fix merge --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32762 -> 32858 bytes faxtomail-ui-swing/pom.xml | 2 +- pom.xml | 7 ------- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index ea071eb..e512b8c 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index b82ef86..0aaaedd 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -289,7 +289,7 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> - + </dependencies> <build> diff --git a/pom.xml b/pom.xml index 4c204e6..5467db1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> -<<<<<<< HEAD - <version>6</version> -======= <version>9</version> ->>>>>>> 1d67506... upgrade pom </parent> <groupId>com.franciaflex</groupId> @@ -141,14 +137,11 @@ <license.organizationName>Mac-Groupe, Code Lutin</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> -<<<<<<< HEAD -======= <!-- Java version --> <javaVersion>1.7</javaVersion> <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> ->>>>>>> 1d67506... upgrade pom <!-- issues status to include in changelog --> <!--<redmine.statusIds>18,19,3,10,11</redmine.statusIds>--> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.