Merge pull request #372 from matiu/npm-version.0.1.2

Npm version.0.1.2

package.json

@@ -1,7 +1,7 @@
 {
   "name": "insight-bitcore",
   "description": "An open-source bitcoin blockchain API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": {
     "name": "Ryan X Charles",
     "email": "ryan@bitpay.com"
@@ -25,7 +25,7 @@
       "email": "cmgustavo83@gmail.com"
     },
     {
-      "name": "Juan Sosa",
+      "name": "Juan Ignacio Sosa Lopez",
       "email": "bechilandia@gmail.com"
     }
   ],

public/views/transaction/tx.html

@@ -100,15 +100,8 @@
       <div data-ng-repeat="vout in tx.vout" data-ng-show="itemsExpanded">
         <div class="col-md-12 transaction-vin-vout">
           <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vout.value)}}
-<<<<<<< HEAD
             <span class="text-success" data-ng-show="!vout.spentTxId"  tooltip="Output is unspent" tooltip-placement="left">(U)</span>
             <a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spentTxId" href="/#!/tx/{{vout.spentTxId}}" title="Spent at: {{vout.spentTxId}},{{vout.spentIndex}}"></a>&nbsp;&nbsp;
-=======
-            <span class="text-success" data-ng-show="!vout.spendTxId"  tooltip="Output is unspent" tooltip-placement="left">(U)</span>
-            <a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spendTxId" href="/#!/tx/{{vout.spendTxId}}" title="Spent at: {{vout.spendTxId}},{{vout.spendIndex}}"></a>&nbsp;&nbsp;
->>>>>>> 8e733340d31053254750053c5ca686eac87c5139
- 
-
           </small>
 
           </div>