Github user amihalik commented on the pull request:
https://github.com/apache/incubator-rya/pull/21#issuecomment-192227049
If you fix the conflicts below, I'll merge your PR:
```
CONFLICT (content): Merge conflict in
extras/indexingExample/src/main/java/MongoRyaDirectExample.java
CONFLICT (content): Merge conflict in
extras/indexing/src/test/java/mvm/rya/indexing/external/PrecompJoinOptimizerIntegrationTest.java
CONFLICT (modify/delete):
extras/indexing/src/test/java/mvm/rya/indexing/external/AccumuloIndexSetTest2.java
deleted in 13de8a5645391b65ba0a6753eedbb51bff4d7bee and modified
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
