Commit f31078bfbc40f773769fef09fc3ff9fe1b8ecdc7
1 parent
3a17befe
Exists in
master
Resolução dos conflitos nas versões dos artefatos
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
pom.xml
| @@ -39,11 +39,7 @@ | @@ -39,11 +39,7 @@ | ||
| 39 | <modelVersion>4.0.0</modelVersion> | 39 | <modelVersion>4.0.0</modelVersion> |
| 40 | 40 | ||
| 41 | <artifactId>demoiselle-framework-build</artifactId> | 41 | <artifactId>demoiselle-framework-build</artifactId> |
| 42 | -<<<<<<< HEAD | ||
| 43 | <version>2.4.0-ALPHA1-SNAPSHOT</version> | 42 | <version>2.4.0-ALPHA1-SNAPSHOT</version> |
| 44 | -======= | ||
| 45 | - <version>2.3.2-SNAPSHOT</version> | ||
| 46 | ->>>>>>> master | ||
| 47 | <packaging>pom</packaging> | 43 | <packaging>pom</packaging> |
| 48 | 44 | ||
| 49 | <parent> | 45 | <parent> |