Fixing style

js/controllers/history.js

@@ -78,17 +78,11 @@ angular.module('copayApp.controllers').controller('HistoryController',
         }
 
         var items = res.items;
-<<<<<<< HEAD
         var now = new Date();
         _.each(items, function(tx) {
           tx.ts = tx.minedTs || tx.sentTs;
           tx.rateTs = Math.floor((tx.ts || now) / 1000);
           tx.amount = $filter('noFractionNumber')(tx.amount);
-=======
-
-        _.each(items, function(r, index) {
-          r.ts = r.minedTs || r.sentTs;
->>>>>>> Move function getTransactionHistoryCsv to wallet
         });
 
         var index = _.indexBy(items, 'rateTs');

views/history.html

@@ -130,7 +130,7 @@
         <div class="large-9 columns">
           <pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
         </div>
-        <div class="large-3 columns m5t text-right size-12 show-for-large-only">
+        <div class="large-3 columns m5t text-right size-12 show-for-large-up">
           <div ng-if="generating">
             <i class="fi-bitcoin-circle icon-rotate spinner"></i> 
             <span translate>Generating file...</span>