interim

2017-02-19 13:56:00 -05:00
parent c5f837c68e
commit 20dc3a1d4b
2 changed files with 2 additions and 7 deletions
@@ -175,13 +175,8 @@ The results of a query can thus be used as proof in an `IBCPacketPostTx`.
 Now that we have all the background knowledge, let's actually walk through the tutorial.

 Make sure you have installed
-<<<<<<< 5be9db68dbd6a69ba886c5a6e55b90f2cecd2ca8
-[tendermint](https://tendermint.com/intro/getting-started/download) and
-[basecoin](/docs/guide/install.md).
-=======
 [Tendermint](https://tendermint.com/intro/getting-started/download) and
-[adam](/docs/guide/install.md).
->>>>>>> doc edits
+[basecoin](/docs/guide/install.md).

 `basecoin` is a framework for creating new cryptocurrency applications.

@@ -52,7 +52,7 @@ func NewExamplePlugin() *ExamplePlugin {
 	}
 }

-// Return a byte array unique to this plugin which will be used as the key which
+// Return a byte array unique to this plugin which is used as the key
 // to store the plugin state (ExamplePluginState)
 func (ep *ExamplePlugin) StateKey() []byte {
 	return []byte("ExamplePlugin.State")