fix conflicts

2017-08-30 15:02:47 +01:00
parent 82ed9489e5 085cef8fb3
commit 04fa170603
52 changed files with 1478 additions and 91 deletions
@@ -538,7 +538,7 @@
    <properties>
        <multiverse.version>0.7.0</multiverse.version>
        <cglib.version>3.2.4</cglib.version>
-        <commons-lang.version>3.5</commons-lang.version>
+        <commons-lang.version>3.6</commons-lang.version>
        <commons-text.version>1.1</commons-text.version>
        <commons-beanutils.version>1.9.3</commons-beanutils.version>
        <commons-chain.version>1.2</commons-chain.version>
@@ -583,4 +583,4 @@
        <joda-time.version>2.9.9</joda-time.version>
        <hirondelle-date4j.version>1.5.1</hirondelle-date4j.version>
    </properties>
-</project>
+</project>