fix merge problems

catena2w · catena2w · commit 0669d3e34129 · 2016-06-09T18:29:01.000Z
diff --git a/scorex-transaction/src/test/scala/scorex/transaction/GenesisTransactionSpecification.scala b/scorex-transaction/src/test/scala/scorex/transaction/GenesisTransactionSpecification.scala
@@ -21,9 +21,9 @@ class GenesisTransactionSpecification extends PropSpec with PropertyChecks with
   }
 
   property("GenesisTransaction parse from Bytes should work fine") {
-    val bytes = Base58.decode("y9KVfkMyuvik3koq45snK6vP27L12VdmuNSCVBvqPMsESvpDiUjT5dyb").get
+    val bytes = Base58.decode("5GoidY2PcCc7ENdrcapZcmmdq2H57NuiXEdgVkpfnnzkB4o8R575WVR1Xw").get
 
-    val actualTransaction = GenesisTransaction.parseBytes(bytes.tail).get
+    val actualTransaction = GenesisTransaction.parseBytes(bytes).get
 
     val balance = 149857264546L
     val timestamp = 4598723454L

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ class GenesisTransactionSpecification extends PropSpec with PropertyChecks with`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`property("GenesisTransaction parse from Bytes should work fine") {`
`24`		`- val bytes = Base58.decode("y9KVfkMyuvik3koq45snK6vP27L12VdmuNSCVBvqPMsESvpDiUjT5dyb").get`
	`24`	`+ val bytes = Base58.decode("5GoidY2PcCc7ENdrcapZcmmdq2H57NuiXEdgVkpfnnzkB4o8R575WVR1Xw").get`
`25`	`25`
`26`		`- val actualTransaction = GenesisTransaction.parseBytes(bytes.tail).get`
	`26`	`+ val actualTransaction = GenesisTransaction.parseBytes(bytes).get`
`27`	`27`
`28`	`28`	`val balance = 149857264546L`
`29`	`29`	`val timestamp = 4598723454L`