Github user cestella commented on a diff in the pull request:
https://github.com/apache/metron/pull/781#discussion_r141933534
--- Diff: metron-stellar/stellar-common/pom.xml ---
@@ -51,6 +52,11 @@
</exclusions>
</dependency>
<dependency>
--- End diff --
Yep, added and dealt with merge conflicts.---
