From 180c6a84f88b9a511fa61068a85878af9b0ab9ee Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Tue, 16 Dec 2014 17:49:49 -0300
Subject: [PATCH] fix conflict

---
 views/send.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/send.html b/views/send.html
index 617919c99..6197de5c8 100644
--- a/views/send.html
+++ b/views/send.html
@@ -105,14 +105,14 @@
                 </small>
               </div>
               <div ng-show="!showAlternative">
+                <label for="amount">
+                  <span translate>Amount</span>
+                </label>
 
-              <label for="amount">
-                <span translate>Amount</span>
-              </label>
-
-              <div class="input">
-                <input type="number" id="amount" ng-disabled="loading || lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off">
-                <a class="postfix" ng-click="showAlternative = true">{{$root.wallet.settings.unitName}}</a>
+                <div class="input">
+                  <input type="number" id="amount" ng-disabled="loading || lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off">
+                  <a class="postfix" ng-click="showAlternative = true">{{$root.wallet.settings.unitName}}</a>
+                </div>
               </div>
               <div ng-show="showAlternative">
                 <label for="alternative"><span translate>Amount in</span> {{ alternativeName }}