Fix merge errors
This commit is contained in:
parent
44c1cbcbc0
commit
37b88908fd
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.common</groupId>
|
<groupId>org.thingsboard.common</groupId>
|
||||||
<version>3.2.1-SNAPSHOT</version>
|
<version>3.3.0-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard.msa</groupId>
|
<groupId>org.thingsboard.msa</groupId>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
<version>3.2.1-SNAPSHOT</version>
|
<version>3.3.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>org.thingsboard.msa.transport</groupId>
|
<groupId>org.thingsboard.msa.transport</groupId>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.thingsboard</groupId>
|
<groupId>org.thingsboard</groupId>
|
||||||
<version>3.2.1-SNAPSHOT</version>
|
<version>3.3.0-SNAPSHOT</version>
|
||||||
<artifactId>transport</artifactId>
|
<artifactId>transport</artifactId>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user