From f31078bfbc40f773769fef09fc3ff9fe1b8ecdc7 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Fri, 25 Jan 2013 11:22:33 -0300
Subject: [PATCH] Resolução dos conflitos nas versões dos artefatos

---
 pom.xml | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1e2dd77..f8733b8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>demoiselle-framework-build</artifactId>
-<<<<<<< HEAD
 	<version>2.4.0-ALPHA1-SNAPSHOT</version>
-=======
-	<version>2.3.2-SNAPSHOT</version>
->>>>>>> master
 	<packaging>pom</packaging>
 
 	<parent>
--
libgit2 0.21.2