From b20dad3a47afe46d817494f5aaa664c9a9347ddb Mon Sep 17 00:00:00 2001
From: Julian Cesar dos Santos <julian.santos@serpro.gov.br>
Date: Wed, 28 Sep 2016 17:04:31 -0300
Subject: [PATCH] Fix parent pom

---
 demoiselle-parent/pom.xml | 16 ----------------
 1 file changed, 0 insertions(+), 16 deletions(-)

diff --git a/demoiselle-parent/pom.xml b/demoiselle-parent/pom.xml
index 44aac50..832887a 100644
--- a/demoiselle-parent/pom.xml
+++ b/demoiselle-parent/pom.xml
@@ -175,41 +175,25 @@
             <dependency>
                 <groupId>org.demoiselle.jee</groupId>
                 <artifactId>demoiselle-core</artifactId>
-<<<<<<< HEAD
-                <version>${version}</version>
-=======
                 <version>3.0.0-BETA1-SNAPSHOT</version>
->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
             </dependency>
                         
             <dependency>
                 <groupId>org.demoiselle.jee</groupId>
                 <artifactId>demoiselle-security</artifactId>
-<<<<<<< HEAD
                 <version>${demoiselle.version}</version>
-=======
-                <version>3.0.0-BETA1-SNAPSHOT</version>
->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
             </dependency>
             
             <dependency>
                 <groupId>org.demoiselle.jee</groupId>
                 <artifactId>demoiselle-rest</artifactId>
-<<<<<<< HEAD
                 <version>${demoiselle.version}</version>
-=======
-                <version>3.0.0-BETA1-SNAPSHOT</version>
->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
             </dependency>
             
             <dependency>
                 <groupId>org.demoiselle.jee</groupId>
                 <artifactId>demoiselle-persistence-jpa</artifactId>
-<<<<<<< HEAD
                 <version>${demoiselle.version}</version>
-=======
-                <version>3.0.0-BETA1-SNAPSHOT</version>
->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
             </dependency>
 
         </dependencies>
--
libgit2 0.21.2