Skip to content

Commit

Permalink
Merge branch 'master' into 2.0.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
#	src/main/resources/META-INF/definitions.cnd
  • Loading branch information
hduchesne committed Feb 8, 2021
2 parents 51f386f + f359f01 commit 62c711e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@
</parent>
<groupId>org.jahia.se.modules</groupId>
<artifactId>industrial</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Industrial</name>
<description>
This module is designed for marketers or communication team to create quickly and easily
landing pages or microsites.
</description>
<scm>
<connection>scm:git:https://github.com/hduchesne/industrial.git</connection>
<developerConnection>scm:git:https://github.com/hduchesne/industrial.git</developerConnection>
<connection>scm:git:git@github.com:hduchesne/industrial.git</connection>
<developerConnection>scm:git:git@github.com:hduchesne/industrial.git</developerConnection>
<url>https://github.com/hduchesne/industrial</url>
</scm>
<properties>
Expand Down
11 changes: 0 additions & 11 deletions release.properties

This file was deleted.

0 comments on commit 62c711e

Please sign in to comment.