From 9b164019ec9746b1c8d5219122c6b5379b7733ab Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Wed, 18 Jan 2017 22:35:23 +0100
Subject: [PATCH] Fixed bad merge lines

---
 netty_parser/pom.xml | 4 ----
 osgi_test/pom.xml    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml
index cd4a7f92..08d49f91 100644
--- a/netty_parser/pom.xml
+++ b/netty_parser/pom.xml
@@ -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>
diff --git a/osgi_test/pom.xml b/osgi_test/pom.xml
index 963a8db0..dabc1675 100644
--- a/osgi_test/pom.xml
+++ b/osgi_test/pom.xml
@@ -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>