Github user meiercaleb commented on a diff in the pull request:

    https://github.com/apache/incubator-rya/pull/220#discussion_r136616038
  
    --- Diff: 
extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/CreateFluoPcj.java
 ---
    @@ -344,14 +351,18 @@ public String withRyaIntegration(
          * @param ryaInstance - name of Rya instance to connect to
     =======
          * @parlam fluo - A connection to the Fluo application that updates 
the PCJ index. (not null)
    +<<<<<<< 1660b850151ea8c7dd4be7b338edfc7865411798
     >>>>>>> RYA-246-Query-Export-Strategy
          * @return The Fluo application's Query ID of the query that was 
created.
    +=======
    +     * @return FluoQuery containing the metadata for the newly registered 
SPARQL query
    +>>>>>>> RYA-319-Integration of Periodic Query with CLI
    --- End diff --
    
    Done.


---
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.
---

Reply via email to