Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jtarraga committed Jan 31, 2019
2 parents 2a1e00e + 674f45e commit 76a5e5c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<bionetdb.version>0.2.0-SNAPSHOT</bionetdb.version>
<java.version>1.8</java.version>
<java-common-libs.version>3.7.3-SNAPSHOT</java-common-libs.version>
<biodata.version>1.4.2-SNAPSHOT</biodata.version>
<biodata.version>1.4.3-SNAPSHOT</biodata.version>
<cellbase.version>4.6.0-SNAPSHOT</cellbase.version>
<jackson.version>2.8.10</jackson.version>
<jersey.version>2.23</jersey.version>
Expand Down Expand Up @@ -306,4 +306,4 @@
</repository>
</repositories>

</project>
</project>

0 comments on commit 76a5e5c

Please sign in to comment.