Auto stash before merge of "master" and "origin/master"

8 years ago · e2feb00b84
parent d9a550013f
commit e2feb00b84
1 changed files with 65 additions and 65 deletions
--- a/pom.xml
+++ b/pom.xml
@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.7</version>
+				<version>4.12</version>
 		</dependency>
 	</dependencies>
 	<scm>