fix conflicts

2019-05-10 23:22:52 +03:00
parent ba8fce515b 01492d1674
commit 6f7ebf8574
1803 changed files with 33727 additions and 6129 deletions
@@ -128,7 +128,6 @@
        <junit.platform.version>1.4.2</junit.platform.version>
        <junit.vintage.version>5.4.2</junit.vintage.version>
        <log4j2.version>2.8.2</log4j2.version>
-        <h2.version>1.4.196</h2.version>
        <powermock.version>2.0.0-RC.1</powermock.version>
        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>