Merge branch 'master' of gitea.release11.com:R11/release11-tools into release

2023-12-29 12:44:49 +01:00
parent 971cc5f36a 307e732608
commit 0812fc6c49
87 changed files with 2340 additions and 268 deletions
--- a/Samples/xquery/xquery.json
+++ b/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"
 }