From d0c408553d0cc3a89e18f3a3670f418a405b7dab Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Tue, 29 Apr 2014 19:31:59 -0300
Subject: [PATCH] merge conflicts

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 8f80d275f..35f5f3ca2 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
             </div>
             <div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
               <div class="large-4 medium-4 columns line-dashed-v">
-                <a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
+                <a href="#/addresses" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
                   <strong><span>{{$root.getWalletDisplay()}}</span></strong>
                 </a> 
                 <a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>