diff options
author | streetturtle <streetturtle@gmail.com> | 2016-01-12 23:04:24 +0100 |
---|---|---|
committer | streetturtle <streetturtle@gmail.com> | 2016-01-12 23:04:24 +0100 |
commit | 6d3bf31e650bd8403923290ac7db8f7efc37a7b6 (patch) | |
tree | 4f1045de5400db7069245af5a5759c34c0302321 | |
parent | edf7bcadf080f5bf0b5f96e055c768df66e2d5be (diff) | |
parent | 6c5962bc6be26ac4f31213756da82bc2d3a50f0f (diff) |
Merge branch 'master' of https://github.com/streetturtle/AwesomeWM
-rw-r--r-- | RatesWidget/readme.md | 4 |
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 |