fixed merge conflict

This commit is contained in:
Patrick Alexander 2015-12-02 16:59:52 -07:00 committed by Riccardo Spagni
parent 1794bf1ff3
commit 8de776dd49
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -11,10 +11,10 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
### User Guides - always a work in progress! ### 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-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-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-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-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-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-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-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-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-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-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="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> <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>