summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Makhov <streetturtle@users.noreply.github.com>2016-01-12 23:02:09 +0100
committerPavel Makhov <streetturtle@users.noreply.github.com>2016-01-12 23:02:09 +0100
commit6c5962bc6be26ac4f31213756da82bc2d3a50f0f (patch)
tree3e477cdcddb5d59bc597226a8c97f0e411d4ff2f
parent9605554ebade5c11a11215cc5f508eabbd0c6ca8 (diff)
Update readme.md
-rw-r--r--RatesWidget/readme.md4
1 files changed, 0 insertions, 4 deletions
diff --git a/RatesWidget/readme.md b/RatesWidget/readme.md
index 385bf48..d13bae1 100644
--- a/RatesWidget/readme.md
+++ b/RatesWidget/readme.md
@@ -2,11 +2,7 @@
Widget for Awesome WM which displays the currency rate between Swiss Frank and Euro. For the rate API it uses [fixer.io](http://fixer.io/) - JSON API for foreign exchange rates and currency conversion. And a python script which calls this API.
-<<<<<<< HEAD
You can read more about it in these posts:
- http://pavelmakhov.com/2016/01/how-to-create-widget/
- http://pavelmakhov.com/2016/01/how-to-create-widget-part-2/
-=======
-For more details you can read related post in my blog: http://pavelmakhov.com/2016/01/how-to-create-widget/
->>>>>>> e7470f8e8b04aa65d2b9539cbad3d7521bb3b969