This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 1d27a065fe154d7b8f768b1986c5f42f0fbbe738 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 17 13:33:33 2014 +0000 fix poms --- coselmar-bundle/pom.xml | 3 --- coselmar-persistence/pom.xml | 3 --- coselmar-rest/pom.xml | 3 --- coselmar-ui/pom.xml | 3 --- pom.xml | 4 ---- 5 files changed, 16 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index c42e5ff..7955ac8 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<<<<<<< HEAD -======= <!-- #%L Coselmar :: Bundle @@ -23,7 +21,6 @@ #L% --> ->>>>>>> refs/heads/master <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> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 9d953fd..fd8a8aa 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<<<<<<< HEAD -======= <!-- #%L Coselmar :: Persistence @@ -23,7 +21,6 @@ #L% --> ->>>>>>> refs/heads/master <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> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 34b7fc0..402db18 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<<<<<<< HEAD -======= <!-- #%L Coselmar :: Rest Services @@ -23,7 +21,6 @@ #L% --> ->>>>>>> refs/heads/master <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> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 3f5fa64..d7bda8f 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<<<<<<< HEAD -======= <!-- #%L Coselmar :: UI @@ -23,7 +21,6 @@ #L% --> ->>>>>>> refs/heads/master <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> diff --git a/pom.xml b/pom.xml index cddf632..d74e758 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,6 @@ #L% --> -<<<<<<< HEAD -======= - ->>>>>>> refs/heads/master <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> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.