aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArno Richter <oelna@oelna.de>2017-12-20 00:51:55 +0100
committerArno Richter <oelna@oelna.de>2017-12-20 00:51:55 +0100
commit5b66fb60158b9399ab9611436e616e33beacfe1f (patch)
treed4a69c9c7d0917d9c24319d8ee60d4122fc9bf65
parentbe1caa07cd615450599ba8c3c8cd5f0647d1f7a8 (diff)
parent16a92171023782153acc23cd7335913ddfbbb362 (diff)
downloadmicroblog-5b66fb60158b9399ab9611436e616e33beacfe1f.tar.gz
microblog-5b66fb60158b9399ab9611436e616e33beacfe1f.tar.bz2
microblog-5b66fb60158b9399ab9611436e616e33beacfe1f.zip
fix conflict in README.md, sigh
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index b427bec..d5ea943 100644
--- a/README.md
+++ b/README.md
@@ -27,4 +27,4 @@ The app requires at least PHP 5.5 and was tested on 7.0
The app is provided for free, but if you'd like to support what I do, please consider tipping.
-[![Gittip](https://www.dropbox.com/s/23emy7ngeqdnrrc/logo_gittip.png?raw=1)](https://www.gittip.com/oelna/) [![Flattr](https://www.dropbox.com/s/20legqru72ffddw/logo_flattr.png?raw=1)](https://flattr.com/submit/auto?user_id=oelna&url=https%3A%2F%2Fgithub.com%2Foelna%2Fmicroblog&title=microblog&language=en&tags=github&category=software) \ No newline at end of file
+[![Gittip](https://www.dropbox.com/s/23emy7ngeqdnrrc/logo_gittip.png?raw=1)](https://www.gittip.com/oelna/) [![Flattr](https://www.dropbox.com/s/20legqru72ffddw/logo_flattr.png?raw=1)](https://flattr.com/submit/auto?user_id=oelna&url=https%3A%2F%2Fgithub.com%2Foelna%2Fmicroblog&title=microblog&language=en&tags=github&category=software)