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

cb52754e · CJentzsch · 48606e05 · 8b79ae66 · cb52754e
Commit cb52754e authored Feb 23, 2015 by CJentzsch
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

trieanyorder.json TrieTests/trieanyorder.json +0 -1

No files found.
--- a/TrieTests/trieanyorder.json
+++ b/TrieTests/trieanyorder.json
@@ -25,7 +25,6 @@
  "foo": {
    "in": {
      "foo": "bar",
-      "food": "bat",
      "food": "bass"
    },
    "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"