resolved merge conflict

This commit is contained in:
Riccardo Spagni 2016-01-11 20:18:20 +02:00
commit cefef8ca22
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -17,4 +17,4 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
<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="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="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-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-center" 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>