Skip to content

Commit

Permalink
Merge branches 'build_enhancement' and 'master' of github.com:CloudSl…
Browse files Browse the repository at this point in the history
…ang/cloud-slang into build_enhancement

Signed-off-by: Levente Bonczidai <levente.bonczidai@hpe.com>

# Conflicts:
#	pom.xml
  • Loading branch information
Levente Bonczidai committed Jan 11, 2018
2 parents f42f66f + 686d9dc commit af61102
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<!--Project dependencies-->
<spring.version>4.3.10.RELEASE</spring.version>
<hamcrest.version>1.3</hamcrest.version>
<score.version>0.3.46</score.version>
<score.version>0.3.47</score.version>
<!--Project properties-->
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.enforcer.plugin.version>1.4.1</maven.enforcer.plugin.version>
Expand Down

0 comments on commit af61102

Please sign in to comment.