From 018efc71cfb0edcfe5a8979d75e8840af3b8df7d Mon Sep 17 00:00:00 2001 From: Frank Bian Date: Wed, 20 May 2015 11:16:51 +0800 Subject: [PATCH] update conficts for PR --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 387e816b..117b3889 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ Table of Contents * https://talky.io/ - Free group video chat. Anonymous. Peer‑to‑peer. No plugins, signup, or payment required. * http://sourcetalk.net/ - Code discussion tool, free for open code talks. * http://vipaar.com/ - Help over video with augmented reality. Free without analytics, encryption, support. - * https://evernote.com/ - Tool for organizing information. Share your notes and work together with others. + * https://evernote.com/ - Tool for organizing information. Share your notes and work together with others. + * https://www.wunderlist.com/ - Share your lists and work collaboratively on projects with your colleagues - Available for free to download and use on iPhone,iPad,Mac,Android,Windows and the Web. ## Code Quality