Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
This commit is contained in:
stijnb1234 2020-04-15 13:04:51 +02:00
commit a19275cecc

View file

@ -169,7 +169,7 @@
<dependency> <dependency>
<groupId>nl.SBDevelopment</groupId> <groupId>nl.SBDevelopment</groupId>
<artifactId>SBUtilities</artifactId> <artifactId>SBUtilities</artifactId>
<version>1.9</version> <version>1.7</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>