Merge remote-tracking branch 'origin/develop' into develop

10 years ago · cb52754e6c
parent 48606e05c1 8b79ae6695
commit cb52754e6c
1 changed files with 0 additions and 1 deletions
--- a/TrieTests/trieanyorder.json
+++ b/TrieTests/trieanyorder.json
@ -25,7 +25,6 @@
  "foo": {
    "in": {
      "foo": "bar",
-      "food": "bat",
      "food": "bass"
    },
    "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"