update batmass-io to 1.33.0

Nesvilab · May 10, 2024 · 2c17a37 · 2c17a37
1 parent 6ebfa73
commit 2c17a37
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 163 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,7 @@ def slf4jVersion = '1.7.26'
 
 dependencies {
     implementation 'org.apache.commons:commons-math3:3.6.1'
-    implementation ('com.github.chhh:batmass-io:1.32.5') {
+    implementation ('com.github.chhh:batmass-io:1.33.0') {
         exclude group: 'org.slf4j', module: 'slf4j-api'
     }
     // https://mvnrepository.com/artifact/org.apache.commons/commons-math3

diff --git a/lib/batmass-io-1.32.4.jar b/lib/batmass-io-1.32.4.jar
diff --git a/lib/batmass-io-1.32.5.pom b/lib/batmass-io-1.32.5.pom
diff --git a/lib/batmass-io-1.32.5.jar → lib/batmass-io-1.33.0.jar b/lib/batmass-io-1.32.5.jar → lib/batmass-io-1.33.0.jar
diff --git a/lib/batmass-io-1.32.4.pom → lib/batmass-io-1.33.0.pom b/lib/batmass-io-1.32.4.pom → lib/batmass-io-1.33.0.pom
@@ -9,11 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.chhh</groupId>
   <artifactId>batmass-io</artifactId>
-<<<<<<<< HEAD:lib/batmass-io-1.32.4.pom
-  <version>1.32.4</version>
-========
-  <version>1.32.5</version>
->>>>>>>> f4a9a78 (switch to using batmass-io for glycan parsing):lib/batmass-io-1.32.5.pom
+  <version>1.33.0</version>
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>