From c92ea0a2b2cc5b95a2281ef0e1f7007cd7bc5a6e Mon Sep 17 00:00:00 2001
From: bakasura980 <bakasura@abv.bg>
Date: Mon, 20 Jan 2020 13:55:16 +0200
Subject: [PATCH] Update README.md

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c29fa5a..01c11c0 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ EOS development and deployment framework based on eosjs.js. The framework's main
 Telegram - https://t.me/eoslime   
 Documentation - https://lyubo.gitbook.io/eoslime/
 
-<<<<<<< HEAD
+
 # Version 1.0.2 change log
 
 * **Fix ABI Parsing** - https://github.com/LimeChain/eoslime/issues/37
@@ -28,8 +28,6 @@ EOSLIME was able to be initialized only with pre-configured providers connection
 * **Describe how examples in the documentation could be run**
 * **Increase the code coverage from 46% to 90+ %**
 
-=======
->>>>>>> 0b1d6e3dd38e1f4f9553dd0f5705a108b00daebc
 # Version 1.0.1 change log
 
 * **Token** option was added
@@ -54,4 +52,4 @@ await contract.doSmth('Your args here', { from: user1, tokens: '5.0000 SYS' });
 If you skip scope, the default one will be set to the from
 ```javascript
 await Provider.select('table').from('contract name').scope('account name').find()
-```
\ No newline at end of file
+```