Solve conflict

This commit is contained in:
sujiyan
2019-04-01 17:45:40 +08:00
parent 51503d5d41
commit 4d70534af2
3 changed files with 31 additions and 8 deletions

View File

@ -21,9 +21,11 @@ What can I do?
- Update this [list](blacklist/blacklist.md) with evidence to help every worker.
- Add this [badge](externals/instruction.md) to your project to support 996.ICU.
- License your awesome projects with the 996ICU License.
---
- 更新这个[名单](blacklist/blacklist.md)(附带证据),来帮助每一位工作者。
- 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU
- 为您的项目添加996ICU License。
The principle and purpose of this repository!
---
@ -79,4 +81,10 @@ License
>
> This draft is adapted from the MIT license. For more detailed explaination, please see [Wiki](https://github.com/kattgu7/996-License-Draft/wiki). This license is designed to be compatible with all major open source licenses.
>
> For law professionals or anyone who are willing to contribute to further version directly, please go to [Anti-996-License-Draft](https://github.com/kattgu7/996-License-Draft). Thank you.
Awesome projects under 996ICU License:
---
[See a full list of projects under 996ICU License](awesomelist/projects.md).

10
awesomelist/projects.md Normal file
View File

@ -0,0 +1,10 @@
Projects under 996ICU License. Thanks for your support!
===
无论大小,从我做起,贡献出一份属于自己的力量。已加入 996 License 项目列表,欢迎随时补充。
|LOGO|项目|官网|简介|
|:---:|:---|:---|:---|
|-| [dura](https://github.com/CN-YUANYU/dura) |-| 基于 redux、typescript 的前端数据流方案 |
| - | [vue-apis](https://github.com/ChangedenCZD/vue-apis) |[ChangedenCZD](https://github.com/ChangedenCZD)| 集成axios的vue插件 |
| - | [optimize-vue](https://github.com/ChangedenCZD/optimize-vue) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架 |
| - | [optimize-vue-cli](https://github.com/ChangedenCZD/optimize-vue-cli) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架的脚手架 |

View File

@ -61,3 +61,8 @@
|北京|[北京霁云科技](https://xin.baidu.com/detail/compinfo?pid=xlTM-TogKuTwdr2zNtf0Zpjhxx2gQd9FZQmd&from=ps)|2019年3月|996|[boss直聘](https://www.zhipin.com/gongsi/2c08264377f4a5c61nx739i-Fw~~.html?ka=search_rcmd_company_2c08264377f4a5c61nx739i-Fw~~)|
|广州|[多益网络](https://www.duoyi.com)|2018年3月|9106|[看准](https://www.kanzhun.com/gsr1365983tl56.html)、[知乎](https://www.zhihu.com/question/22713470/answer/145287600)|
更多黑名单
---
[shengxinjing/programmer-job-blacklist](https://github.com/shengxinjing/programmer-job-blacklist)