zcash-hackworks
/
insight-ui-zcash
mirror of https://github.com/zcash-hackworks/insight-ui-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflits

This commit is contained in:
Matias Alejo Garcia 2014-01-20 16:53:54 -03:00
parent 05f2cf426c
commit 1c6b506dbb
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/controllers/transactions.js
View File

@ -22,12 +22,7 @@ angular.module('insight.transactions').controller('transactionsController',
txId: txid
}, function(tx) {
$scope.tx = tx;
<<<<<<< HEAD
console.log(console.log(tx));
$scope.txs.push(tx);
}, function() {
$rootScope.flashMessage = 'Transaction Not Found';
=======
}, function(e) {
if (e.status === 400) {
$rootScope.flashMessage = 'Invalid Transaction ID: ' + $routeParams.txId;
@ -38,7 +33,6 @@ angular.module('insight.transactions').controller('transactionsController',
else {
$rootScope.flashMessage = 'Transaction Not Found';
}
>>>>>>> matiu/feature/11showsyncstatus
$location.path('/');
});
};