resolve merge conflits
This commit is contained in:
parent
05f2cf426c
commit
1c6b506dbb
|
@ -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('/');
|
||||
});
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue