Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
garemoko committed Jun 21, 2017
2 parents a53a069 + ff0562a commit 7069670
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ This document outlines various ways of contributing to the specification:
* [Making a Pull Request to address an issue](#make-pr)

<a name='review-pr'></a>

### Review a Pull Request (PR)
The most helpful **and** easiest way to contribute to the specification is to review an existing PR. You can find a
[list of open PRs here](https://github.com/adlnet/xAPI-Spec/pulls). To review a PR you should:
Expand Down Expand Up @@ -175,6 +176,7 @@ When reviewing a PR please don't:
* Make vague criticisms without suggesting the changes to the PR that would meet those criticisms.

<a name='suggest-solution'></a>

### Suggest a solution
The second most helpful and second easiest way to contribute to the specification is to suggest a solution to an issue that has been raised.
Ideally the person who raises the issue will propose a solution, but this does not always happen and you may be able to improve a suggestion.
Expand All @@ -193,6 +195,7 @@ Once your suggestion has been discussed and agreed, add another comment summaris
Good and detailed suggested solutions for issues make it much easier to write PRa and helps to ensure those PRs are merged faster.

<a name='make-pr'></a>

### Make a Pull Request (PR)
The hardest way of directly contributing to the specification is to make Pull Requests and the xAPI Working Group recommends only getting involved in this way if you are already used to Github and markdown and/or have previously contributed to reviewing PRs and suggesting solutions to issues.

Expand Down Expand Up @@ -323,6 +326,7 @@ direct you to a page that gives you the ability to submit a request to the
master repository to merge in the changes you committed.

<a name='style-guide'></a>

## Style Guide

### Expected Values
Expand Down

0 comments on commit 7069670

Please sign in to comment.