Resolved the merge conflict

This commit is contained in:
Abdullah A Malik 2016-10-20 12:31:36 +05:00
commit 8e000b5364

View File

@ -25,6 +25,7 @@ If you are an open source project maintainer, add the label `first-timers-only`
## Go
- [Docker](https://github.com/docker/docker/labels/exp%2Fbeginner) _(label: exp/beginner)_ <br> Open-source application container engine
- [Apex](https://github.com/apex/apex/labels/contrib%20(easy)) _(label: contrib (easy))_ <br> Build, Deploy, and Manage AWS Lambda functions with ease
## Java
@ -58,6 +59,8 @@ If you are an open source project maintainer, add the label `first-timers-only`
- [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn/labels/good%20for%20beginner) _(label: good for beginner)_ <br> Awesome ESLint rules.
- [Hyper](https://github.com/zeit/hyper/labels/Good%20for%20beginners) _(label: Good for beginners)_ <br> JS/HTML/CSS Terminal
- [pdf.js](https://github.com/mozilla/pdf.js/labels/5-good-beginner-bug) _(label: 5-good-beginner-bug)_ <br> PDF Reader in JavaScript
- [Moment.js](https://github.com/moment/moment/labels/Up-For-Grabs) _(label: Up-For-Grabs)_ <br> A lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates.
- [serverless](https://github.com/serverless/serverless/labels/help-wanted-easy) _(label: help-wanted-easy)_ <br> The Serverless Framework
- [Hoodie Camp](https://github.com/hoodiehq/camp/issues?q=is%3Aissue+is%3Aopen+label%3Afirst-timers-only) _(label: first-timers-only)_ <br> Hoodie Camp is a space for new and existing contributors.
## Julia