Skip to content
Snippets Groups Projects
Commit f89a464e authored by Cyril Dangerville's avatar Cyril Dangerville
Browse files

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	pom.xml
parents e10a9718 0f361814
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
pom.xml
+ 2
− 2
View file @ f89a464e
......@@ -38,7 +38,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.8.0</version>
<version>6.11</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
<version>2.4.0</version>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment