Skip to content

Changed AUTHORS.txt to CHANGES.rst in CONTRIBUTING.md #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2016
Merged

Changed AUTHORS.txt to CHANGES.rst in CONTRIBUTING.md #628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ and 2.7.
Once you have code, documentation and tests ready, it is time to finalize
the pull request.

### AUTHORS.txt
### CHANGES.rst
If you have done any non-trivial change and would like to be credited,
add yourself to
[AUTHORS.txt](https://github.com/robotframework/Selenium2Library/blob/master/AUTHORS.txt)
[CHANGES.rst](https://github.com/robotframework/Selenium2Library/blob/master/CHANGES.rst)
file.

### Resolving conflicts
Expand All @@ -181,7 +181,7 @@ same code as your changes. In that case you should
to allow for an easy merge.

The most common conflicting file is the aforementioned
[AUTHORS.txt](https://github.com/robotframework/Selenium2Library/blob/master/AUTHORS.txt)
[CHANGES.rst](https://github.com/robotframework/Selenium2Library/blob/master/CHANGES.rst)
, but luckily fixing those conflicts is typically easy.

### Squashing commits
Expand Down