update conficts for PR

This commit is contained in:
Frank Bian 2015-05-20 11:16:51 +08:00
parent caa76ec21e
commit 018efc71cf

View File

@ -76,7 +76,8 @@ Table of Contents
* https://talky.io/ - Free group video chat. Anonymous. Peertopeer. 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