Merge branch '2.4.0' of git@github.com:demoiselle/framework.git into

2.4.0 Conflicts: impl/extension/jdbc/src/test/resources/arquillian.xml

Merge branch '2.4.0' of git@github.com:demoiselle/framework.git into
2.4.0 Conflicts: impl/extension/jdbc/src/test/resources/arquillian.xml
Cleverson Sacramento
2 parents d3e93709 5ceeaf71
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
impl/extension/jdbc/src/test/resources/arquillian.xml
@@ -51,4 +51,4 @@
 		</configuration>
 	</container>
 	-->
-</arquillian>
 \ No newline at end of file
+</arquillian>
	@@ -51,4 +51,4 @@		@@ -51,4 +51,4 @@
51	</configuration>	51	</configuration>
52	</container>	52	</container>
53	-->	53	-->
54	-</arquillian>
55	\ No newline at end of file	54	\ No newline at end of file
		55	+</arquillian>