Merge branch 'master' into leanpub-preview

manuscript/recipes/cryptominer/wallet.md

@@ -23,15 +23,6 @@ I mine most of my coins to Exchanges, but I do have the following wallets:
 
 Now, continue to the next stage of your grand mining adventure:
 
-<<<<<<< HEAD:manuscript/recipies/cryptominer/wallet.md
-1. Build your [mining rig](/recipies/cryptominer/mining-rig/) 💻
-2. Setup your [AMD](/recipies/cryptominer/amd-gpu/) or [Nvidia](/recipies/cryptominer/nvidia-gpu/) GPUs 🎨
-3. Sign up for [mining pools](/recipies/cryptominer/mining-pool/) :swimmer:
-4. Setup your miners with [Miner Hotel](/recipies/cryptominer/minerhotel/) 🏨
-5. Send your coins to [exchanges](/recipies/cryptominer/exchange/)  or wallets (_This page_) 💹
-6. [Monitor](/recipies/cryptominer/monitor/) your empire :heartbeat:
-7. [Profit](/recipies/cryptominer/profit/)! 
-=======
 1. Build your [mining rig](/recipes/cryptominer/mining-rig/) 💻
 2. Setup your [AMD](/recipes/cryptominer/amd-gpu/) or [Nvidia](/recipes/cryptominer/nvidia-gpu/) GPUs 🎨
 3. Sign up for [mining pools](/recipes/cryptominer/mining-pool/) :swimmer:
@@ -39,12 +30,11 @@ Now, continue to the next stage of your grand mining adventure:
 5. Send your coins to [exchanges](/recipes/cryptominer/exchange/)  or wallets (_This page_) 💹
 6. [Monitor](/recipes/cryptominer/monitor/) your empire :heartbeat:
 7. [Profit](/recipes/cryptominer/profit/)! 💰
->>>>>>> master:manuscript/recipes/cryptominer/wallet.md
 
 
 ## Chef's Notes
 
-### Tip your waiter (donate) 
+### Tip your waiter (support me) 👏
 
 Did you receive excellent service? Want to make your waiter happy? (_..and support development of current and future recipes!_) See the [support](/support/) page for (_free or paid)_ ways to say thank you!