summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstreetturtle <streetturtle@gmail.com>2016-01-12 23:00:56 +0100
committerstreetturtle <streetturtle@gmail.com>2016-01-12 23:00:56 +0100
commit9605554ebade5c11a11215cc5f508eabbd0c6ca8 (patch)
tree9b9d347fb2a08332a9e9c2d7c5296d8e00a739c8
parentaa4c4b621a98d5e538cd02bb551517e5c8bad72d (diff)
parente7470f8e8b04aa65d2b9539cbad3d7521bb3b969 (diff)
readme changes
-rw-r--r--RatesWidget/readme.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/RatesWidget/readme.md b/RatesWidget/readme.md
index d13bae1..385bf48 100644
--- a/RatesWidget/readme.md
+++ b/RatesWidget/readme.md
@@ -2,7 +2,11 @@
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