From ccdcabc626da85b46fb424ddf9f6498b5c3bd3d4 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 4 Jul 2018 15:18:35 +0200
Subject: [PATCH] remove bad rebasing token

---
 src/app/panels/terminal.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 1c794be37a..25b2c01c74 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -579,13 +579,5 @@ function domTerminalFeatures (self, scopedCommands) {
 }
 
 function blockify (el) { return yo`<div class=${css.block}>${el}</div>` }
-<<<<<<< HEAD
-=======
-// PENDING TX
-function updatePendingTxs (udapp, el) {
-  var count = Object.keys(udapp.pendingTransactions()).length
-  el.innerText = count
-}
->>>>>>> fix terminal api
 
 module.exports = Terminal