Commit 7a745980 authored by Marc Burnie [AWS]'s avatar Marc Burnie [AWS]
Browse files

resolving merge conflicts

parents b3fe7739 8b798f84
......@@ -57,7 +57,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.13.0-rc2</version>
<version>0.13.0-rc3</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment