Resolução dos conflitos nas versões dos artefatos

Cleverson Sacramento
1 parent 3a17befe
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
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>
...	...	@@ -39,11 +39,7 @@
39	39	<modelVersion>4.0.0</modelVersion>
40	40
41	41	<artifactId>demoiselle-framework-build</artifactId>
42		-<<<<<<< HEAD
43	42	<version>2.4.0-ALPHA1-SNAPSHOT</version>
44		-=======
45		- <version>2.3.2-SNAPSHOT</version>
46		->>>>>>> master
47	43	<packaging>pom</packaging>
48	44
49	45	<parent>
...	...