finished_milestone (#279)

Co-authored-by: Adam Bem <adam.bem@zoho.eu>
Reviewed-on: #279
Co-authored-by: widlam <mikolaj.widla@gmail.com>
Co-committed-by: widlam <mikolaj.widla@gmail.com>

Samples/xquery/xquery.json

@@ -1,6 +1,10 @@
 {
     "data": "<people><person><name>John</name><age>67</age></person><person><name>Anna</name><age>69</age></person></people>",
+<<<<<<< HEAD
     "process": "for $x in //person return string($x/name)",
+=======
+    "processorData": "for $x in //person return string($x/name)",
+>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
     "processor": "saxon",
     "version": "3.1"
 }