anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bad merge lines

Browse Source
This commit is contained in:
andsel
2017-01-18 22:35:23 +01:00
parent e777c54414
commit 9b164019ec
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netty_parser/pom.xml
-4
View File
@@ -6,11 +6,7 @@
<relativePath>../</relativePath>
<artifactId>moquette-parent</artifactId>
<groupId>io.moquette</groupId>
<<<<<<< HEAD
<version>0.10-SNAPSHOT</version>
=======
<version>0.9.1.sofia</version>
>>>>>>> ebdee0bb4483b9c3b2332e8be1fe9835e332bc50
</parent>
<artifactId>moquette-netty-parser</artifactId>
osgi_test/pom.xml
-4
View File
@@ -5,11 +5,7 @@
<relativePath>../</relativePath>
<artifactId>moquette-parent</artifactId>
<groupId>io.moquette</groupId>
<<<<<<< HEAD
<version>0.10-SNAPSHOT</version>
=======
<version>0.9.1.sofia</version>
>>>>>>> ebdee0bb4483b9c3b2332e8be1fe9835e332bc50
</parent>
<artifactId>moquette-osgi-test</artifactId>