Skip to content

Commit 378a188

Browse files
committed
merge conflict
2 parents 2eb59bc + 890ad0a commit 378a188

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

curation-module-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>curation-module</artifactId>
55
<groupId>eu.clarin.cmdi</groupId>
6-
<version>3.0.1</version>
6+
<version>3.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>curation-module-core</artifactId>
@@ -143,5 +143,5 @@
143143
</plugin>
144144
</plugins>
145145
</build>
146-
<version>3.0.1</version>
146+
<version>3.1</version>
147147
</project>

curation-module-web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>curation-module</artifactId>
88
<groupId>eu.clarin.cmdi</groupId>
9-
<version>3.0.1</version>
9+
<version>3.1</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>eu.clarin.cmdi</groupId>
8585
<artifactId>curation-module-core</artifactId>
86-
<version>3.0.1</version>
86+
<version>3.1</version>
8787
<scope>compile</scope>
8888
</dependency>
8989
</dependencies>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>pom</packaging>
99

1010

11-
<version>3.0.1</version>
11+
<version>3.1</version>
1212

1313
<organization>
1414
<name>CLARIN</name>

0 commit comments

Comments
 (0)