Unverified Commit 8de776dd authored by Patrick Alexander's avatar Patrick Alexander Committed by Riccardo Spagni
Browse files

fixed merge conflict

parent 1794bf1f
......@@ -11,10 +11,10 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
### User Guides - always a work in progress!
<div class="text-center" style="padding-bottom: 15px;"><a style="color: #505050;" href="Offline_Backup"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Creating an Offline Backup of your Monero Account</span></h2></a></div>
<div class="text-center" style="padding-bottom: 15px;"><a style="color: #505050;" href="howto_fix_stuck_funds"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to fix locked up funds</span></h2></a></div>
<div class="text-center" style="padding-bottom: 15px;"><a style="color: #505050;" href="restore_account"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to restore your account</span></h2></a></div>
<div class="text-center" style="padding-bottom: 15px;"><a style="color: #505050;" href="view_only"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to make a view only wallet</span></h2></a></div>
<div class="text-center" style="padding-bottom: 15px;"><a style="color: #505050;" href="vps_run_node"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to run a node on VPS</span></h2></a></div>
<div class="text-center" style="padding-bottom: 15px;"><a style="color: #505050;" href="monero_tools"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Monero tools</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="howto_fix_stuck_funds"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to fix locked up funds</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="Offline_Backup"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to make an offline backup</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="restore_account"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to restore your account</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="view_only"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to make a view only wallet</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="vps_run_node"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to run a node on VPS</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="monero_tools"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Monero tools</span></h2></a></div>
<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="simplewallet"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Getting started with simplewallet</span></h2></a></div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment