Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Desaulniers committed Jan 15, 2015
2 parents 505b81a + 6e246c6 commit bdbce2f
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,14 @@ consumers, I've often seen the best results. Open Source supports that
paradigm better than anything else I've seen to date.

###[Joan Lascano 'Fearful'](https://twitter.com/fearfular)
We live in a shifted reality, where we have to keep up to both digital and
physical worlds. We are more conscious of the data that surround us and
We live in a shifted reality, where we have to keep up to both digital and
physical worlds. We are more conscious of the data that surround us and
the potential of the collective effort with an open channel for communication.

Contributing to Open Source will help us not only to cooperate collectively
but also make products or projects succeed or at least improve quality and
reliability. Even if a project is not pick up at the moment, having that
source code online could help lots of people and maybe someday come back
Contributing to Open Source will help us not only to cooperate collectively
but also make products or projects succeed or at least improve quality and
reliability. Even if a project is not pick up at the moment, having that
source code online could help lots of people and maybe someday come back
from another user.

###[Wei Deng](https://github.com/weideng)
Expand All @@ -365,3 +365,12 @@ from another user.
开源项目使我们有机会与世界级编程高手学习、交流;开源项目引领IT技术的发展趋势;
开源项目极大的加快了技术的发展速度;开源项目使的我们个人改变世界的能力更加强大。
开源产品更加值得信赖,因为你能看到每一行代码。

###[Dongsheng Xue](http://weibo.com/u/2204424827)
我是一个开发者,开源软件对我来说代表着自由,公开,奉献和个性化。自由是我可以选择我所需要
的功能,去掉我不需要的部分。公开表示我可以很明确的知道软件会对我做些什么,是否会推送广告,
是否会记录我的信息。奉献是我在开发过程中曾经无数次借鉴开源项目的经验,一次次给我解决问题
的灵感,甚至引用一部分开源软件的代码。个性化代表着我可以通过开源软件得到独属于我的独一无
二的应用,我可以定制我喜欢的颜色,我想要的界面,甚至简化操作过程,这些只需要简单的修改开
源的代码就可以实现。总之,感谢所有的开源软件贡献者,谢谢。

0 comments on commit bdbce2f

Please sign in to comment.