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

ethereum · Feb 23, 2015 · cb52754 · cb52754
2 parents 48606e0 + 8b79ae6
commit cb52754
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/TrieTests/trieanyorder.json b/TrieTests/trieanyorder.json
@@ -25,7 +25,6 @@
   "foo": {
     "in": {
       "foo": "bar",
-      "food": "bat",
       "food": "bass"
     },
     "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"