| commit | 056eb7d5d53c869181f7b7b832cb9ae8dd306be7 | [log] [tgz] |
|---|---|---|
| author | trisha-melani <prathapan.pradeepa@gmail.com> | Fri Nov 05 00:35:36 2021 +0530 |
| committer | trisha-melani <prathapan.pradeepa@gmail.com> | Fri Nov 05 00:35:36 2021 +0530 |
| tree | ff329d59be1416236291815a002b5e016dd7a1d2 | |
| parent | e2ef9987975212c044e20c75d3ab2758f741a02f [diff] |
Fix merge conflicts
diff --git a/pom.xml b/pom.xml index 590dcfc..8eeca13 100755 --- a/pom.xml +++ b/pom.xml
@@ -889,7 +889,7 @@ <couchdb.version>1.5.0</couchdb.version> <!-- MongoDB Dependencies --> - <mongo.driver.version>3.12.8</mongo.driver.version> + <mongo.driver.version>3.12.10</mongo.driver.version> <!-- HiveStore Dependencies --> <metamodel.version>5.3.0</metamodel.version>