merge

1 files changed, 25 insertions, 0 deletions

diff --git a/StateTests/RandomTests/st201503181402GO.json b/StateTests/RandomTests/st201503181402GO.json
index 4bfebe889..dfe103f10 100644
--- a/StateTests/RandomTests/st201503181402GO.json
+++ b/StateTests/RandomTests/st201503181402GO.json
@@ -14,6 +14,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
                 "balance" : "135064676",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000100000000000000000000000000000000000000006f410464647b786344d593a36a7d6c37740760005155",
                 "nonce" : "0",
@@ -24,6 +25,8 @@
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "45592",
 =======
+=======
+>>>>>>> Stashed changes
                 "balance" : "360204830",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f174765560005155",
                 "nonce" : "0",
@@ -33,6 +36,9 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "48344",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
@@ -41,10 +47,14 @@
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
                 "balance" : "999999999864889778",
 =======
                 "balance" : "999999999639746872",
 >>>>>>> Stashed changes
+=======
+                "balance" : "999999999639746872",
+>>>>>>> Stashed changes
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -52,17 +62,23 @@
             }
         },
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
         "postStateRoot" : "9bf681c8ac3e3d9947b5547fde3975e4ab5357002593818a0667b7cb8502e521",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000100000000000000000000000000000000000000006f410464647b786344d593a36a7d6c37740760005155",
 =======
+=======
+>>>>>>> Stashed changes
         "postStateRoot" : "ddc721471702c65e93e9e92ae00bed5b508ed56a70a9a8d3ab534446bea0dbd9",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f174765560005155",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
                 "nonce" : "0",
                 "storage" : {
@@ -85,21 +101,30 @@
         },
         "transaction" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000100000000000000000000000000000000000000006f410464647b786344d593a36a7d6c377407",
             "gasLimit" : "0x49d64c79",
 =======
             "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f17476",
             "gasLimit" : "0x5c2076dc",
 >>>>>>> Stashed changes
+=======
+            "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f17476",
+            "gasLimit" : "0x5c2076dc",
+>>>>>>> Stashed changes
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             "value" : "135064676"
 =======
             "value" : "360204830"
 >>>>>>> Stashed changes
+=======
+            "value" : "360204830"
+>>>>>>> Stashed changes
         }
     }
 }