From 6dad60eab4640b6c0051cb83051b234c78ba2164 Mon Sep 17 00:00:00 2001
From: Mustafa Buyukcelebi <mustafa.buyukcel@gmail.com>
Date: Sun, 5 May 2019 15:23:11 +0300
Subject: [PATCH] Conflict

---
 src/screens/transfer/screen/transferScreen.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/screens/transfer/screen/transferScreen.js b/src/screens/transfer/screen/transferScreen.js
index f2184e602..45216f334 100644
--- a/src/screens/transfer/screen/transferScreen.js
+++ b/src/screens/transfer/screen/transferScreen.js
@@ -53,14 +53,9 @@ class TransferView extends Component {
           this.setState({ [key]: value });
           break;
         case 'amount':
-<<<<<<< HEAD
-          if (!isNaN(value) && parseFloat(value) <= parseFloat(balance))
-            this.setState({ [key]: value });
-=======
           if ((parseFloat(Number(value)) <= parseFloat(balance))) {
             this.setState({ [key]: value });
           }
->>>>>>> feb784d9679b44d20148f7770d7d1a3ff3a6b357
           break;
 
         default: