Skip to content

Commit

Permalink
Remove now-unneccessary fetch-merge
Browse files Browse the repository at this point in the history
The changes from this fetch-merge were merged in [ElementsProject#86](ElementsProject#86).
  • Loading branch information
TomMcCabe authored Jul 12, 2016
1 parent 2a2842e commit 8464fd9
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions fedpeg-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ If you've already indexed testnet:
./bitcoind -rpcuser=$RPC_USER -rpcpassword=$RPC_PASS -testnet -txindex -daemon
```

Checkout `alpha`. Before making any changes of your own,`fetch/merge` a [patch](https://github.com/TomMcCabe/elements/tree/patch) for a few code changes that will consolidate our settings in `sidechain-manipulation.py` and `constants.py` ([PR #86 of Elements Repo](https://github.com/ElementsProject/elements/pull/86)):
Checkout `alpha`:
```shell
git checkout alpha
git fetch https://github.com/TomMcCabe/elements patch
git merge FETCH_HEAD alpha
```

With bitcoin testnet, generate an address and obtain the private/public key.
Expand Down

0 comments on commit 8464fd9

Please sign in to comment.