Revision 50ccf282
Added by Katja Luther over 6 years ago
eu.etaxonomy.taxeditor/pom.xml | ||
---|---|---|
2 | 2 |
<parent> |
3 | 3 |
<groupId>eu.etaxonomy</groupId> |
4 | 4 |
<artifactId>taxeditor-parent</artifactId> |
5 |
<<<<<<< HEAD |
|
6 | 5 |
<version>4.12.0-SNAPSHOT</version> |
7 |
======= |
|
8 |
<version>4.11.1</version> |
|
9 |
>>>>>>> hotfix/4.11.1 |
|
10 | 6 |
</parent> |
11 | 7 |
|
12 | 8 |
<modelVersion>4.0.0</modelVersion> |
Also available in: Unified diff
minor