Fixed merge

Author: barthanssens

README.md

@@ -49,6 +49,6 @@ If no parameter is set, it looks for a default `config-example.json` in the fold
 ## Status
 This is software is still under development. It currently only supports:
 - HDT data sources
-- Turtle output
+- Turtle, NTriples, JsonLD, RDF/XML output
 
 A [more complete server](https://github.com/LinkedDataFragments/Server.js/) has been implemented for the Node.js platform.

src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java

@@ -267,7 +267,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             Model output = fragment.getTriples();
             output.setNsPrefixes(config.getPrefixes());
 
-            // add dataset metadata
+			// add dataset metadata
             String datasetUrl = getDatasetUrl(request);
             Resource datasetId = output.createResource(datasetUrl + "#dataset");
 
@@ -289,8 +289,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             response.setHeader("Server", "Linked Data Fragments Server");
             response.setContentType(bestMatch);
             response.setCharacterEncoding("utf-8");
+            
             RDFDataMgr.write(response.getOutputStream(), output, contentType);
-
         } catch (IOException | URISyntaxException e) {
             throw new ServletException(e);
         }