Update develop to production version to avoid merge conflicts
This commit is contained in:
parent
a504cd251c
commit
5869d0001a
4 changed files with 4 additions and 4 deletions
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ru.micord.ervu</groupId>
|
<groupId>ru.micord.ervu</groupId>
|
||||||
<artifactId>eks</artifactId>
|
<artifactId>eks</artifactId>
|
||||||
<version>1.2.0-SNAPSHOT</version>
|
<version>1.1.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>ru.micord.ervu.eks</groupId>
|
<groupId>ru.micord.ervu.eks</groupId>
|
||||||
<artifactId>backend</artifactId>
|
<artifactId>backend</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ru.micord.ervu</groupId>
|
<groupId>ru.micord.ervu</groupId>
|
||||||
<artifactId>eks</artifactId>
|
<artifactId>eks</artifactId>
|
||||||
<version>1.2.0-SNAPSHOT</version>
|
<version>1.1.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>ru.micord.ervu.eks</groupId>
|
<groupId>ru.micord.ervu.eks</groupId>
|
||||||
|
|
|
||||||
2
pom.xml
2
pom.xml
|
|
@ -4,7 +4,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>ru.micord.ervu</groupId>
|
<groupId>ru.micord.ervu</groupId>
|
||||||
<artifactId>eks</artifactId>
|
<artifactId>eks</artifactId>
|
||||||
<version>1.2.0-SNAPSHOT</version>
|
<version>1.1.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<modules>
|
<modules>
|
||||||
<module>backend</module>
|
<module>backend</module>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ru.micord.ervu</groupId>
|
<groupId>ru.micord.ervu</groupId>
|
||||||
<artifactId>eks</artifactId>
|
<artifactId>eks</artifactId>
|
||||||
<version>1.2.0-SNAPSHOT</version>
|
<version>1.1.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>ru.micord.ervu.eks</groupId>
|
<groupId>ru.micord.ervu.eks</groupId>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue