Github user fpservant commented on the issue:

    https://github.com/apache/jena/pull/139
  
    @afs as I said in y previous mess, I don't seem to be able to get rid of 
the conflict (but I am not an expert with git and github) The only solution I 
see that would probably work would mean to move back ``JsonLDWriter`` from 
``org.apache.jena.riot.writer`` to ``org.apache.jena.riot``.
    
    The merge should be simple enough: the conflicting file is to be removed 
(there is a new version of it in 
``jena-arq/src/main/java/org/apache/jena/riot/out/writer/JsonLDWriter.java``)
    
    



---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to