Merged master into feature-unicode-strings

2025-04-25 01:06:16 -04:00 · 2018-01-12 23:57:02 +00:00 · 2018-01-12 23:57:02 +00:00 · fff188eb30
commit fff188eb30
parent 71067939e3 4cc38db895
20 changed files with 336 additions and 147 deletions
--- a/test/tests/operations/FlowControl.js
+++ b/test/tests/operations/FlowControl.js
@ -37,7 +37,7 @@ TestRegister.addTests([
    },
    {
        name: "Fork, (expect) Error, Merge",
-        input: "1\n2\na\n4",
+        input: "1.1\n2.5\na\n3.4",
        expectedError: true,
        recipeConfig: [
            {
@ -45,8 +45,8 @@ TestRegister.addTests([
                args: ["\n", "\n", false],
            },
            {
-                op: "To Base",
-                args: [16],
+                op: "Object Identifier to Hex",
+                args: [],
            },
            {
                op: "Merge",